Index: trunk/eCard/eCardMVC/adMoto.Payments.Test/UI/MerchantTests.cs
===================================================================
--- trunk/eCard/eCardMVC/adMoto.Payments.Test/UI/MerchantTests.cs (revision 985)
+++ trunk/eCard/eCardMVC/adMoto.Payments.Test/UI/MerchantTests.cs (revision 991)
@@ -5,8 +5,39 @@
 {
     [TestFixture]
-    public class MerchantTests
+    public class MerchantTests : BaseTests
     {
         private readonly UIHelper _uiHelper = new UIHelper();
         private static string adres = UIHelper.LoginSite;
+        private UIData uiData;
+        private const string test = "test";
+       
+        [SetUp]
+        public void SetUp()
+        {
+            System.Diagnostics.Debug.WriteLine("nowy test");
+            _uiHelper.SearchAndClean();
+            ie.GoTo(adres);
+        }
+
+        [Test]
+        [Category("UI")]
+        public void Returns_ZlyHash_When_Invoice_Amount_Is_Zero()
+        {
+            // wartosc testowej faktury 1/SLJ/1 jest 0 (zero)
+            // wowczas eCard powinien zwrocic zlyHash - stala informujaca, ze cos jest nie tak...
+            uiData = _uiHelper.CreateAndAddTestRecordToRepository(0);
+
+            ie.TextField(Find.ByName("numerFaktury")).TypeText(uiData.Test_numer_faktury);
+            ie.TextField(Find.ByName("nip")).TypeText(uiData.Test_nip);
+            ie.Button(Find.ById("loguj")).Click();
+
+            ie.TextField(Find.ByName("Payer.FirstName")).TypeText(test);
+            ie.TextField(Find.ByName("Payer.LastName")).TypeText(test);
+            ie.Button(Find.ById("place")).Click();
+            Assert.IsTrue(ie.ContainsText("Wystąpił nieoczekiwany błąd"));
+
+            //usuniecie rekordu z tabel: FAKTURY, FAKTURA_DETAILS
+            _uiHelper.DeleteTestRecordsFromRepository(uiData);
+        }
 
         [Test]
@@ -15,11 +46,6 @@
         {
             //dodanie testowego rekordu do tabel: FAKTURY, FAKTURA_DETAILS
-            var uiData = _uiHelper.CreateAndAddTestRecordToRepository(2);
+            uiData = _uiHelper.CreateAndAddTestRecordToRepository(2);
             
-            const string test = "test";
-            uiData.Test_surname = test;
-            uiData.Test_firstname = test;
-
-            var ie = new IE(adres);
             ie.TextField(Find.ByName("numerFaktury")).TypeText(uiData.Test_numer_faktury);
             ie.TextField(Find.ByName("nip")).TypeText(uiData.Test_nip);
@@ -31,6 +57,5 @@
             Assert.IsTrue(ie.ContainsText("Imię i nazwisko:" + test + " " + test));
             Assert.IsTrue(ie.Url.Contains("https://pay.ecard.pl/"));
-            _uiHelper.CloseWebBrowser(ie);
-
+           
             //usuniecie rekordu z tabel: FAKTURY, FAKTURA_DETAILS
             _uiHelper.DeleteTestRecordsFromRepository(uiData);
@@ -39,31 +64,5 @@
             _uiHelper.DeleteTestPaymentFromRepository(uiData);
         }
-
-        [Test]
-        [Category("UI")]
-        public void Returns_ZlyHash_When_Invoice_Amount_Is_Zero()
-        {
-            // wartosc testowej faktury 1/SLJ/1 jest 0 (zero)
-            // wowczas eCard powinien zwrocic zlyHash - stala informujaca, ze cos jest nie tak...
-            var uiData = _uiHelper.CreateAndAddTestRecordToRepository(0);
-
-            const string test = "test";
-            uiData.Test_surname = test;
-            uiData.Test_firstname = test;
-
-            var ie = new IE(adres);
-            ie.TextField(Find.ByName("numerFaktury")).TypeText(uiData.Test_numer_faktury);
-            ie.TextField(Find.ByName("nip")).TypeText(uiData.Test_nip);
-            ie.Button(Find.ById("loguj")).Click();
-
-            ie.TextField(Find.ByName("Payer.FirstName")).TypeText(test);
-            ie.TextField(Find.ByName("Payer.LastName")).TypeText(test);
-            ie.Button(Find.ById("place")).Click();
-            Assert.IsTrue(ie.ContainsText("Wystąpił nieoczekiwany błąd"));
-            _uiHelper.CloseWebBrowser(ie);
-
-            //usuniecie rekordu z tabel: FAKTURY, FAKTURA_DETAILS
-            _uiHelper.DeleteTestRecordsFromRepository(uiData);            
-        }
+        
     }
 }