Index: trunk/eCard/eCardMVC/adMoto.Payments.Test/Utils/MerchantTests.cs
===================================================================
--- trunk/eCard/eCardMVC/adMoto.Payments.Test/Web/ValidationMerchantClassTests.cs (revision 971)
+++ trunk/eCard/eCardMVC/adMoto.Payments.Test/Utils/MerchantTests.cs (revision 982)
@@ -4,7 +4,7 @@
 using NUnit.Framework;
 
-namespace adMoto.Payments.Test.Web
+namespace adMoto.Payments.Test.Utils
 {
-    public class ValidationMerchantClassTests
+    public class MerchantTests
     {
         [Test]
@@ -13,11 +13,12 @@
         {
             //Arrange
-            var p = new PlatnosciEcard(){
-                AMOUNT = 100,
-                AUTODEPOSIT = true,
-                ORDERDESCRIPTION = "abc/2009"
-            };
-            var m = new Merchant() { Payment = p };
-            
+            var p = new PlatnosciEcard
+                        {
+                            AMOUNT = 100,
+                            AUTODEPOSIT = true,
+                            ORDERDESCRIPTION = "abc/2009"
+                        };
+            var m = new Merchant { Payment = p };
+
             //Act
             m.IsValid();
@@ -25,5 +26,4 @@
 
             //Assert
-            System.Diagnostics.Debug.WriteLine("Error: " + result + " is not valid.");
             Assert.That(result, Is.EqualTo("currency"));
         }
@@ -34,13 +34,14 @@
         {
             //Arrange
-            var p = new PlatnosciEcard(){
-                AMOUNT = 100,
-                AUTODEPOSIT = true,
-                ORDERDESCRIPTION = "abc/2009",
-                CURRENCY = "test",
-                NAME = "test",
-                SURNAME = "test"
-            };
-            var m = new Merchant(){ Payment = p };
+            var p = new PlatnosciEcard
+                        {
+                            AMOUNT = 100,
+                            AUTODEPOSIT = true,
+                            ORDERDESCRIPTION = "abc/2009",
+                            CURRENCY = "test",
+                            NAME = "test",
+                            SURNAME = "test"
+                        };
+            var m = new Merchant { Payment = p };
 
             //Act
@@ -49,5 +50,4 @@
 
             //Assert
-            System.Diagnostics.Debug.WriteLine("Error: " + result + " is not valid.");
             Assert.That(result, Is.EqualTo("language"));
         }
@@ -58,23 +58,25 @@
         {
             //Arrange
-            var p = new PlatnosciEcard(){
-                AMOUNT = 100,
-                AUTODEPOSIT = true,
-                ORDERDESCRIPTION = "abc/2009",
-                CURRENCY = "test",
-                NAME = "test",
-                SURNAME = "test",
-                LANGUAGE = "test",
-                ORDERNUMBER = 100
-            };
-            var m = new Merchant(){
-                Payment = p,
-                Id = "aaaa",
-                Password = "aa",
-                Hash = "22",
-                LinkFail = "a",
-                LinkOk = "a",
-            };
-            
+            var p = new PlatnosciEcard
+                        {
+                            AMOUNT = 100,
+                            AUTODEPOSIT = true,
+                            ORDERDESCRIPTION = "abc/2009",
+                            CURRENCY = "test",
+                            NAME = "test",
+                            SURNAME = "test",
+                            LANGUAGE = "test",
+                            ORDERNUMBER = 100
+                        };
+            var m = new Merchant
+                        {
+                            Payment = p,
+                            Id = "aaaa",
+                            Password = "aa",
+                            Hash = "22",
+                            LinkFail = "a",
+                            LinkOk = "a",
+                        };
+
             //Act
             m.IsValid();