diff --git a/templates/mailman-django/domain_index.html b/templates/mailman-django/domain_index.html
index 3c18e98..c29b80b 100644
--- a/templates/mailman-django/domain_index.html
+++ b/templates/mailman-django/domain_index.html
@@ -2,13 +2,13 @@
 {% load i18n %}
 
 {% block heading %}
-    {% trans "Add a new Domain" %}
+    {% trans "Domain Index" %}
 {% endblock %}
 
 {% block header %}
     <div class="mm_box">
         <div class="mm_boxHeader">{% trans "About" %}</div>
-            This site allows to register a new Domain, due to restriction in the REST API we can't delete them here yet. Please modify the Mailman DB directly if you need to remove a Domain. If interested take a look at the <a href="https://bugs.launchpad.net/mailmanwebgsoc2011/+bug/799689"> Launchapd Bug Report</a>
+            This site allows to register a new Domain, due to restriction in the REST API we can't delete them here yet. Please modify the Mailman DB directly if you need to remove a Domain. If interested take a look at the <a href="https://bugs.launchpad.net/mailmanwebgsoc2011/+bug/799689"> Launchapd Bug Report.</a> In addition we can't modify them yet.
         </p>
     </div>
 {% endblock %}
diff --git a/tests/test_to_check.txt b/tests/test_to_check.txt
index 1d8ad92..7a51fcc 100644
--- a/tests/test_to_check.txt
+++ b/tests/test_to_check.txt
@@ -1,25 +1,6 @@
     
-Create a New Domain
-=================
-Check the content to see that we came to the create page after 
-logging in.
 
-    >>> response = c.post('/domains/')
-
-    >>> print "Add a new Domain" in response.content
-    True
-
-Now create a new Domain called 'mail.example.com'.
-
-    >>> response = c.post('/domains/',
-    ...                   {"mail_host": "mail.example.com",
-    ...                    "web_host": "example.com",
-    ...                    "description": "doctest testing domain"})  
-
-Check that the new Domain exists in the list of existing domains which is above new_domain form
-
-    >>> print "doctest testing domain" in response.content
-    True
+    
       
 
 Create a New List
diff --git a/tests/tests.py b/tests/tests.py
index 20a5f67..d2b7fbc 100644
--- a/tests/tests.py
+++ b/tests/tests.py
@@ -81,15 +81,35 @@
     >>> c.login(username='james@example.com', password='james')
     True
 
-Domains Page
-===================
-Hence, we log in as an admin on the login page we get as a response 
-to our call.    
+Create a New Domain
+=================
+Check the content to see that we came to the create page after 
+logging in.
 
-    >>> response = c.get('/domains/')
-    >>> print "Add a new Domain" in response.content
+    >>> response = c.post('/domains/')
+
+    >>> print "Domain Index" in response.content #TODO - change heading
     True
-    >>> print response
+    
+Check the button which should allow creation of a new domains
+    >>> '<li class="mm_new_domain"><a href="/domains/new/">New Domain</a></li>' in response.content
+    True
+
+Now go to the Domains creation page
+    >>> response = c.post('/domains/new/')
+    >>> print "Add a new Domain" in response.content #TODO - change heading
+    True
+
+    
+and create a new Domain called 'mail.example.com'.    
+Check that the new Domain exists in the list of existing domains which is above new_domain form
+    >>> response = c.post('/domains/new/',
+    ...                   {"mail_host": "mail.example.com",
+    ...                    "web_host": "example.com",
+    ...                    "description": "doctest testing domain"})  
+    >>> response = c.post('/domains/')
+    >>> print "doctest testing domain" in response.content
+    True
 
 Finishing Test
 ===============