Index: trunk/eCard/eCardMVC/adMoto.Payments.Test/Controllers/MerchantControllerTests.cs
===================================================================
--- trunk/eCard/eCardMVC/adMoto.Payments.Test/Web/MerchantControllerTests.cs (revision 971)
+++ trunk/eCard/eCardMVC/adMoto.Payments.Test/Controllers/MerchantControllerTests.cs (revision 982)
@@ -2,4 +2,5 @@
 using adMoto.Payments.Core.Data;
 using adMoto.Payments.Core.Interfaces;
+using adMoto.Payments.Test.Fakes;
 using adMoto.Payments.Web.Controllers;
 using adMoto.Payments.Web.Models;
@@ -7,10 +8,10 @@
 using System.Web.Mvc;
 
-namespace adMoto.Payments.Test.Web
+namespace adMoto.Payments.Test.Controllers
 {
     [TestFixture]
     public class MerchantControllerTests
     {
-        private readonly Function _function = new Function();
+        private readonly TestDataHelper _testDataHelper = new TestDataHelper();
         private readonly ITranslateManager _translateManager = new FakeTranslation();
 
@@ -21,11 +22,11 @@
             //Arrange
             IRepository<Invoice> repVPayment = new Repository<Invoice>(new FakeDataContext());
-            var platnosc = _function.CreateInvoice(123, "nip1", "", 0, 0);
+            var platnosc = _testDataHelper.CreateInvoice(123, "nip1", "", 0, 0);
             repVPayment.Insert(platnosc);
             
-            var payer = _function.CreatePayer(123, "test", "test");
+            var payer = _testDataHelper.CreatePayer(123, "test", "test");
             
             var controller = new MerchantController(repVPayment, null, _translateManager);
-            controller.ControllerContext = _function.CreateControllerContext("nip2");
+            controller.ControllerContext = _testDataHelper.CreateControllerContext("nip2");
 
             //Act
@@ -44,11 +45,11 @@
             //Arrange
             IRepository<Invoice> repVPayment = new Repository<Invoice>(new FakeDataContext());
-            var platnosc = _function.CreateInvoice(12, "nip1", "", 0, 0);
+            var platnosc = _testDataHelper.CreateInvoice(12, "nip1", "", 0, 0);
             repVPayment.Insert(platnosc);
 
-            var payer = _function.CreatePayer(123, "test", "test");
+            var payer = _testDataHelper.CreatePayer(123, "test", "test");
 
             var controller = new MerchantController(repVPayment, null, _translateManager);
-            controller.ControllerContext = _function.CreateControllerContext("nip2");
+            controller.ControllerContext = _testDataHelper.CreateControllerContext("nip2");
 
             //Act