diff --git a/faq.install b/faq.install
index 3dd11b1..e83c35b 100644
--- a/faq.install
+++ b/faq.install
@@ -84,7 +84,7 @@ function faq_schema() {
  */
 function faq_install() {
   variable_set('node_type_faq', array('status'));
-
+  $t = get_t();
   // Ensure the FAQ node type is available.
   node_types_rebuild();
   $types = node_type_get_types();
diff --git a/faq.test b/faq.test
index e80215d..809d802 100644
--- a/faq.test
+++ b/faq.test
@@ -172,20 +172,20 @@ class FaqAccessTestClass extends FaqTestCase {
   function testFaqAccess() {
 
     // Verify that anonymous user has no access to the faq page
-    $this->faqVerifyNoAccess('faq');
+    $this->faqVerifyNoAccess('faq-page');
 
     // Create and login user
     $normal_user = $this->drupalCreateUser();
     $this->drupalLogin($normal_user);
     // Verify that logged in user has no access to the faq page
-    $this->faqVerifyNoAccess('faq');
+    $this->faqVerifyNoAccess('faq-page');
     $this->drupalLogout();
 
     $view_faq_user = $this->drupalCreateUser(array('view faq page'));
     $this->drupalLogin($view_faq_user);
 
     // Verify that the faq page is visible and available but empty
-    $this->drupalGet('faq');
+    $this->drupalGet('faq-page');
     $this->assertText(t('Frequently Asked Questions'), t('FAQ page is available for view faq page permissions.'));
 
   }
@@ -215,7 +215,7 @@ class CreateFaqTestCase extends FaqTestCase {
     $this->drupalLogin($this->admin_user);
 
     // Verify that the faq page is visible and available but empty
-    $this->drupalGet('faq');
+    $this->drupalGet('faq-page');
     $this->assertText(t('Frequently Asked Questions'), t('FAQ page is available for view faq page permissions.'));
 
     // Fill in the Create FAQ node 1 form and post it
@@ -247,12 +247,12 @@ class CreateFaqTestCase extends FaqTestCase {
 
 
     // Verify that logged in user has no access to the faq page
-    $this->faqVerifyNoAccess('faq');
+    $this->faqVerifyNoAccess('faq-page');
 
     // Check that the FAQ page is available and that the correct term is listed as grouping for the new FAQ node
     $view_faq_user = $this->drupalCreateUser(array('view faq page'));
     $this->drupalLogin($view_faq_user);
-    $this->drupalGet('faq');
+    $this->drupalGet('faq-page');
     $this->assertText(t('Frequently Asked Questions'), t('FAQ page is available for view faq page permissions.'));
     $this->assertText($this->faq1['title'], t('Created FAQ node 1 available on FAQ page.'));
     $this->assertText($this->faq1[$this->instance['field_name'] . '[' . $langcode .']'], t('Term for node 1 available on FAQ page.'));
@@ -275,7 +275,7 @@ class CreateFaqTestCase extends FaqTestCase {
     $this->drupalLogout();
 
     $this->drupalLogin($view_faq_user);
-    $this->drupalGet('faq');
+    $this->drupalGet('faq-page');
     $this->assertText(t('Frequently Asked Questions'), t('FAQ page is available for view faq page permissions.'));
     $this->assertText($this->faq1['title'], t('Created FAQ node 1 available on FAQ page.'));
     $this->assertText($this->faq1[$this->instance['field_name'] . '[' . $langcode .']'], t('Term for node 1 not available on FAQ page.'));
@@ -308,7 +308,7 @@ class CRAUDFaqTestCase extends FaqTestCase {
   public function testFaqCreate() {
 
     // Verify that logged in user has no access to the faq page
-    $this->faqVerifyNoAccess('faq');
+    $this->faqVerifyNoAccess('faq-page');
 
     // Log in user with create FAQ permissions
     $this->drupalLogin($this->faq_user);
@@ -338,7 +338,7 @@ class CRAUDFaqTestCase extends FaqTestCase {
     $this->drupalLogin($faq_view_user);
 
     // Verify visibility on faq page
-    $this->drupalGet('faq'); // Load faq page
+    $this->drupalGet('faq-page'); // Load faq page
     $this->assertText($edit['title']); // Node should be listed here
     $this->drupalGet('node/' . $node->nid); // It should also be possible to open the node directly