Index: /trunk/eCard/eCardMVC/adMoto.Payments.Test/Controllers/eCardControllerTests.cs
===================================================================
--- /trunk/eCard/eCardMVC/adMoto.Payments.Test/Controllers/eCardControllerTests.cs (revision 985)
+++ /trunk/eCard/eCardMVC/adMoto.Payments.Test/Controllers/eCardControllerTests.cs (revision 987)
@@ -45,7 +45,7 @@
                                                          {"CURRENTSTATE", "4"},
                                                          {"PREVIOUSSTATE", "5"},
-                                                         {"PAYMENTTYPE", "1"},
-                                                         {"EVENTTYPE", "0"},
-                                                         {"PAYMENTNUMBER", "1"},
+                                                         {"PAYMENTTYPE", "True"},
+                                                         {"EVENTTYPE", "False"},
+                                                         {"PAYMENTNUMBER", "True"},
                                                          {"APPROVALCODE", "6"},
                                                          {"VALIDATIONCODE", "7"},
@@ -57,8 +57,8 @@
 
             var result = controller.Status() as ContentResult;
-
+            System.Diagnostics.Debug.WriteLine(_repConfirm.Count() + result.Content);
             Assert.That(result.Content.Contains("OK"));
-            
-            var paymentConfirmation = _repConfirm.FindAll().First();
+
+            var paymentConfirmation = _repConfirm.FindOne(p=>p.ORDERNUMBER == 2);
             Assert.That(paymentConfirmation.MERCHANTNUMBER, Is.EqualTo("1"));
             Assert.That(paymentConfirmation.ORDERNUMBER, Is.EqualTo(2));
@@ -82,6 +82,20 @@
         {
             var controller = CreateController();
-            var valueCollection = new NameValueCollection {{"ORDERNUMBER", "fdsf"}};
-            controller.Request.Form.Add(valueCollection);
+            var formValues = new NameValueCollection {
+                                                         {"MERCHANTNUMBER", "1"}, 
+                                                         {"ORDERNUMBER", "sgfgsfg"},
+                                                         {"COMMTYPE", "3"},
+                                                         {"CURRENTSTATE", "4"},
+                                                         {"PREVIOUSSTATE", "5"},
+                                                         {"PAYMENTTYPE", "True"},
+                                                         {"EVENTTYPE", "False"},
+                                                         {"PAYMENTNUMBER", "True"},
+                                                         {"APPROVALCODE", "6"},
+                                                         {"VALIDATIONCODE", "7"},
+                                                         {"BIN", "8"},
+                                                         {"AUTHTIME", DateTime.Now.ToString()},
+                                                         {"TYPE", "9"},
+                                                         {"WITHCVC", "10"}};
+            controller.Request.Form.Add(formValues);
 
             var result = controller.Status() as ContentResult;
@@ -97,7 +111,20 @@
         {
             var controller = CreateController();
-            var valueCollection = new NameValueCollection { { "PAYMENTTYPE", "32hvhsvhv" } };
-            controller.Request.Form.Add(valueCollection);
-
+            var formValues = new NameValueCollection {
+                                                         {"MERCHANTNUMBER", "1"}, 
+                                                         {"ORDERNUMBER", "sgfgsfg"},
+                                                         {"COMMTYPE", "3"},
+                                                         {"CURRENTSTATE", "4"},
+                                                         {"PREVIOUSSTATE", "5"},
+                                                         {"PAYMENTTYPE", "32hvhsvhv"},
+                                                         {"EVENTTYPE", "False"},
+                                                         {"PAYMENTNUMBER", "True"},
+                                                         {"APPROVALCODE", "6"},
+                                                         {"VALIDATIONCODE", "7"},
+                                                         {"BIN", "8"},
+                                                         {"AUTHTIME", DateTime.Now.ToString()},
+                                                         {"TYPE", "9"},
+                                                         {"WITHCVC", "10"}};
+            controller.Request.Form.Add(formValues);
             var result = controller.Status() as ContentResult;
 
@@ -112,7 +139,21 @@
         {
             var controller = CreateController();
-            var valueCollection = new NameValueCollection { { "EVENTTYPE", "32hvhsvhv" } };
-            controller.Request.Form.Add(valueCollection);
-
+            var formValues = new NameValueCollection {
+                                                         {"MERCHANTNUMBER", "1"}, 
+                                                         {"ORDERNUMBER", "sgfgsfg"},
+                                                         {"COMMTYPE", "3"},
+                                                         {"CURRENTSTATE", "4"},
+                                                         {"PREVIOUSSTATE", "5"},
+                                                         {"PAYMENTTYPE", "True"},
+                                                         {"EVENTTYPE", "32hvhsvhv"},
+                                                         {"PAYMENTNUMBER", "True"},
+                                                         {"APPROVALCODE", "6"},
+                                                         {"VALIDATIONCODE", "7"},
+                                                         {"BIN", "8"},
+                                                         {"AUTHTIME", DateTime.Now.ToString()},
+                                                         {"TYPE", "9"},
+                                                         {"WITHCVC", "10"}};
+            controller.Request.Form.Add(formValues);
+            
             var result = controller.Status() as ContentResult;
 
@@ -127,6 +168,20 @@
         {
             var controller = CreateController();
-            var valueCollection = new NameValueCollection { { "ORDERNUMBER", "12311111111111111" } };
-            controller.Request.Form.Add(valueCollection);
+            var formValues = new NameValueCollection {
+                                                         {"MERCHANTNUMBER", "1"}, 
+                                                         {"ORDERNUMBER", "1231111111111111111"},
+                                                         {"COMMTYPE", "3"},
+                                                         {"CURRENTSTATE", "4"},
+                                                         {"PREVIOUSSTATE", "5"},
+                                                         {"PAYMENTTYPE", "32hvhsvhv"},
+                                                         {"EVENTTYPE", "False"},
+                                                         {"PAYMENTNUMBER", "True"},
+                                                         {"APPROVALCODE", "6"},
+                                                         {"VALIDATIONCODE", "7"},
+                                                         {"BIN", "8"},
+                                                         {"AUTHTIME", DateTime.Now.ToString()},
+                                                         {"TYPE", "9"},
+                                                         {"WITHCVC", "10"}};
+            controller.Request.Form.Add(formValues);
 
             var result = controller.Status() as ContentResult;
@@ -142,9 +197,24 @@
         {
             var controller = CreateController();
-            var valueCollection = new NameValueCollection { { "VALIDATIONCODE", "1234" } };
-            controller.Request.Form.Add(valueCollection);
-
-            var result = controller.Status() as ContentResult;
-
+            var formValues = new NameValueCollection {
+                                                         {"MERCHANTNUMBER", "1"}, 
+                                                         {"ORDERNUMBER", "12"},
+                                                         {"COMMTYPE", "3"},
+                                                         {"CURRENTSTATE", "4"},
+                                                         {"PREVIOUSSTATE", "5"},
+                                                         {"PAYMENTTYPE", "True"},
+                                                         {"EVENTTYPE", "False"},
+                                                         {"PAYMENTNUMBER", "True"},
+                                                         {"APPROVALCODE", "6"},
+                                                         {"VALIDATIONCODE", "76666"},
+                                                         {"BIN", "8"},
+                                                         {"AUTHTIME", DateTime.Now.ToString()},
+                                                         {"TYPE", "9"},
+                                                         {"WITHCVC", "10"}};
+            controller.Request.Form.Add(formValues);
+
+            var result = controller.Status() as ContentResult;
+
+            System.Diagnostics.Debug.WriteLine(result.Content);
             Assert.That(_repConfirm.Count(), Is.EqualTo(0), "Should not have any items");
             Assert.That(result.Content.Contains("FALSE"), "Response should contain FALSE");
