diff --git a/tests/www/bookmarksTest.php b/tests/www/bookmarksTest.php
index eaf78bf..1f6d1a5 100755
--- a/tests/www/bookmarksTest.php
+++ b/tests/www/bookmarksTest.php
@@ -98,10 +98,37 @@ class www_bookmarksTest extends TestBaseApi
         $ns = $x->getDocNamespaces();
         $x->registerXPathNamespace('ns', reset($ns));
 
-        $elements = $x->xpath('//ns:link');
-        $this->assertEquals(5, count($elements), 'Number of Links in Head not correct');
-        $this->assertContains('privatekey=', (string)$elements[4]['href']);
+        $elements = $x->xpath('//ns:link[@rel="alternate" and @type="application/rss+xml"]');
+        $this->assertEquals(2, count($elements), 'Number of Links in Head not correct');
+        $this->assertContains('privatekey=', (string)$elements[1]['href']);
     }//end testVerifyPrivateRSSLinkExists
 
+
+    /**
+     * Test that the private RSS link doesn't exists when a user
+     * does not have a private key or is not enabled
+     */
+    public function testVerifyPrivateRSSLinkDoesNotExist()
+    {
+        list($req, $uId) = $this->getLoggedInRequest('?unittestMode=1', true);
+
+        $user = $this->us->getUser($uId);
+        $reqUrl = $GLOBALS['unittestUrl'] . 'bookmarks.php/'
+            . $user['username'];
+        $req->setUrl($reqUrl);
+        $req->setMethod(HTTP_Request2::METHOD_GET);
+        $response = $req->send();
+        $response_body = $response->getBody();
+        $this->assertNotEquals('', $response_body, 'Response is empty');
+
+        $x = simplexml_load_string($response_body);
+        $ns = $x->getDocNamespaces();
+        $x->registerXPathNamespace('ns', reset($ns));
+
+        $elements = $x->xpath('//ns:link[@rel="alternate" and @type="application/rss+xml"]');
+        $this->assertEquals(1, count($elements), 'Number of Links in Head not correct');
+        $this->assertNotContains('privatekey=', (string)$elements[0]['href']);
+    }//end testVerifyPrivateRSSLinkDoesNotExist
+
 }//end class www_bookmarksTest
 ?>
diff --git a/tests/www/indexTest.php b/tests/www/indexTest.php
new file mode 100644
index 0000000..d95a328
--- /dev/null
+++ b/tests/www/indexTest.php
@@ -0,0 +1,63 @@
+<?php
+require_once dirname(__FILE__) . '/../prepare.php';
+require_once 'HTTP/Request2.php';
+
+class www_indexTest extends TestBaseApi
+{
+    protected $urlPart = 'api/posts/add';
+
+    /**
+     * Test that the private rss feed exists when user is setup
+     * with a private key and is enabled
+     */
+    public function testVerifyPrivateRSSLinkExists()
+    {
+        list($req, $uId) = $this->getLoggedInRequest('?unittestMode=1', true, true);
+
+        $user = $this->us->getUser($uId);
+        $reqUrl = $GLOBALS['unittestUrl'] . 'index.php/';
+        $req->setUrl($reqUrl);
+        $req->setMethod(HTTP_Request2::METHOD_GET);
+        $response = $req->send();
+        $response_body = $response->getBody();
+        $this->assertNotEquals('', $response_body, 'Response is empty');
+
+        $x = simplexml_load_string($response_body);
+        $ns = $x->getDocNamespaces();
+        $x->registerXPathNamespace('ns', reset($ns));
+
+        $elements = $x->xpath('//ns:link[@rel="alternate" and @type="application/rss+xml"]');
+        $this->assertEquals(2, count($elements), 'Number of Links in Head not correct');
+        $this->assertContains('privatekey=', (string)$elements[1]['href']);
+    }//end testVerifyPrivateRSSLinkExists
+
+
+    /**
+     * Test that the private RSS link doesn't exists when a user
+     * does not have a private key or is not enabled
+     */
+    public function testVerifyPrivateRSSLinkDoesNotExist()
+    {
+        list($req, $uId) = $this->getLoggedInRequest('?unittestMode=1', true);
+
+        $user = $this->us->getUser($uId);
+        $reqUrl = $GLOBALS['unittestUrl'] . 'bookmarks.php/'
+            . $user['username'];
+        $req->setUrl($reqUrl);
+        $req->setMethod(HTTP_Request2::METHOD_GET);
+        $response = $req->send();
+        $response_body = $response->getBody();
+        $this->assertNotEquals('', $response_body, 'Response is empty');
+
+        $x = simplexml_load_string($response_body);
+        $ns = $x->getDocNamespaces();
+        $x->registerXPathNamespace('ns', reset($ns));
+
+        $elements = $x->xpath('//ns:link[@rel="alternate" and @type="application/rss+xml"]');
+        $this->assertEquals(1, count($elements), 'Number of Links in Head not correct');
+        $this->assertNotContains('privatekey=', (string)$elements[0]['href']);
+    }//end testVerifyPrivateRSSLinkDoesNotExist
+
+
+}//end class www_bookmarksTest
+?>
diff --git a/tests/www/searchTest.php b/tests/www/searchTest.php
index 5dce69d..89af32d 100644
--- a/tests/www/searchTest.php
+++ b/tests/www/searchTest.php
@@ -1,4 +1,6 @@
 <?php
+require_once dirname(__FILE__) . '/../prepare.php';
+require_once 'HTTP/Request2.php';
 
 class www_SearchTest extends TestBaseApi
 {
@@ -65,4 +67,4 @@ class www_SearchTest extends TestBaseApi
 
 }
 
-?>
\ No newline at end of file
+?>