Index: trunk/eCard/eCardMVC/Platnosci.Tests/Web/TestMethods.cs
===================================================================
--- trunk/eCard/eCardMVC/Platnosci.Tests/Web/TestMethods.cs (revision 954)
+++ trunk/eCard/eCardMVC/Platnosci.Tests/Web/TestMethods.cs (revision 957)
@@ -1,6 +1,4 @@
 using NUnit.Framework;
 using Platnosci.Core.Linq;
-using Platnosci.Models;
-using System.Linq;
 using Platnosci.Core.Interface;
 
@@ -11,5 +9,4 @@
     {
         private readonly Function _function = new Function();
-        private readonly ITranslateManager _translateManager = new FakeTranslation();
 
         [Test]
@@ -27,20 +24,5 @@
             System.Diagnostics.Debug.WriteLine("Wartosc nip ma byc 'nip'. Jest " + pl.nip);
             Assert.That(pl.nip, Is.EqualTo("nip"));
-        }
-        [Test]
-        [Category("Unit")]
-        public void TestMethodCreateAndAddNewPaymentOk()
-        {
-            var idFaktury = 123;
-            var repPayment = new Repository<PlatnosciEcard>(new FakeDataContext());
-            var funkcjePlatnosci = new FunkcjePlatnosci(repPayment, _translateManager);
-            var invoice = _function.CreateInvoice(idFaktury, "nip", "abc/2009", 200, 2);
-            var payer = _function.CreatePayer(idFaktury, "test", "test");
-            var waluta = new Waluta {Amount = 200, Currency = "PLN"};
-            var result = funkcjePlatnosci.CreateAndAddNewPyment(invoice, waluta ,payer, "sessionId");
-
-            var payment = repPayment.Find(p => p.IDFaktury == 123).SingleOrDefault();
-            Assert.That(payment.IDFaktury, Is.EqualTo(idFaktury));
-        }
+        }        
 
     }
Index: trunk/eCard/eCardMVC/Platnosci.Tests/Web/Function.cs
===================================================================
--- trunk/eCard/eCardMVC/Platnosci.Tests/Web/Function.cs (revision 951)
+++ trunk/eCard/eCardMVC/Platnosci.Tests/Web/Function.cs (revision 957)
@@ -27,5 +27,5 @@
             platnosc.Brutto = brutto;
             platnosc.waluta_brutto = walutaBrutto;
-            platnosc.waluta_miano = currency;
+            platnosc.waluta_miano = currency.ToUpper();
             platnosc.SystemKsiegowyId = systemKsiegowy;
            
Index: trunk/eCard/eCardMVC/Platnosci.Tests/Web/FunkcjePlatnosciTests.cs
===================================================================
--- trunk/eCard/eCardMVC/Platnosci.Tests/Web/FunkcjePlatnosciTests.cs (revision 955)
+++ trunk/eCard/eCardMVC/Platnosci.Tests/Web/FunkcjePlatnosciTests.cs (revision 957)
@@ -3,8 +3,9 @@
 using System.Linq;
 using System.Text;
+using NUnit.Framework;
+using Platnosci.Models;
+using Platnosci.Core.Linq;
+using Platnosci.Core.Interface;
 
-using NUnit.Framework;
-
-using Platnosci.Models;
 
 namespace Platnosci.Tests.Web
@@ -13,4 +14,7 @@
     class FunkcjePlatnosciTests
     {
+        private readonly Function _function = new Function();
+        private readonly ITranslateManager _translateManager = new FakeTranslation();
+
         [Test, Sequential]
         [Category("Unit")]
@@ -24,4 +28,19 @@
             Assert.That(result, Is.EqualTo(output));
         }
+        [Test]
+        [Category("Unit")]
+        public void TestMethodCreateAndAddNewPaymentOk()
+        {
+            var idFaktury = 123;
+            var repPayment = new Repository<PlatnosciEcard>(new FakeDataContext());
+            var funkcjePlatnosci = new FunkcjePlatnosci(repPayment, _translateManager);
+            var invoice = _function.CreateInvoice(idFaktury, "nip", "abc/2009", 200, 2);
+            var payer = _function.CreatePayer(idFaktury, "test", "test");
+            var waluta = new Waluta { Amount = 200, Currency = FunkcjePlatnosci.PLN };
+            var result = funkcjePlatnosci.CreateAndAddNewPyment(invoice, waluta, payer, "sessionId");
+
+            var payment = repPayment.Find(p => p.IDFaktury == 123).SingleOrDefault();
+            Assert.That(payment.IDFaktury, Is.EqualTo(idFaktury));
+        }
     }
 }
Index: trunk/eCard/eCardMVC/Platnosci.Tests/Web/MerchantControllerTests.cs
===================================================================
--- trunk/eCard/eCardMVC/Platnosci.Tests/Web/MerchantControllerTests.cs (revision 952)
+++ trunk/eCard/eCardMVC/Platnosci.Tests/Web/MerchantControllerTests.cs (revision 957)
@@ -22,11 +22,11 @@
             vPlatnosciEcard platnosc = _function.CreateInvoice(123, "nip1", "", 0, 0);
             repVPayment.Insert(platnosc);
-
+            
             Payer payer = _function.CreatePayer(123, "test", "test");
-
-            var controller = new PlatnoscController(repVPayment, null, null, _translateManager);
+            
+            var controller = new MerchantController(repVPayment, null, _translateManager);
             controller.ControllerContext = _function.CreateControllerContext("nip2");
 
-            var result = controller.Show(payer, "pl") as ViewResult;
+            var result = controller.Merchant(payer, "pl") as ViewResult;
             var error = (ErrorViewData)result.ViewData.Model;
 
@@ -44,8 +44,8 @@
             Payer payer = _function.CreatePayer(123, "test", "test");
 
-            var controller = new PlatnoscController(repVPayment, null, null, _translateManager);
+            var controller = new MerchantController(repVPayment, null, _translateManager);
             controller.ControllerContext = _function.CreateControllerContext("nip2");
 
-            var result = controller.Show(payer, "pl") as ViewResult;
+            var result = controller.Merchant(payer, "pl") as ViewResult;
             var error = (ErrorViewData)result.ViewData.Model;
 
@@ -71,5 +71,5 @@
             var payment = repPayment.FindOne(i => i.IDFaktury == idFaktury);
 
-            System.Diagnostics.Debug.WriteLine(payment + " -- Faktura jest w EUR.");
+            System.Diagnostics.Debug.WriteLine("Faktura jest w EUR.");
             System.Diagnostics.Debug.WriteLine("PLN:" + amountPL + "," + " EUR:" + amountEUR);
             Assert.That(payment.AMOUNT, Is.EqualTo(amountEUR * 100));