diff --git a/tests/content_access.test b/tests/content_access.test
index 45abda3..9d9d0c2 100644
--- a/tests/content_access.test
+++ b/tests/content_access.test
@@ -2,15 +2,15 @@
 
 /**
  * @file
- * Automatd SimpleTest Case for content access module
+ * Automated SimpleTest Case for content access module.
  */
 
-require_once(drupal_get_path('module', 'content_access') .'/tests/content_access_test_help.php');
+require_once drupal_get_path('module', 'content_access') . '/tests/content_access_test_help.php';
 
 class ContentAccessModuleTestCase extends ContentAccessTestCase {
 
   /**
-   * Implementation of get_info() for information
+   * Implements get_info() for information.
    */
   public static function getInfo() {
     return array(
@@ -23,275 +23,276 @@ class ContentAccessModuleTestCase extends ContentAccessTestCase {
   function setUp($module = '') {
     parent::setUp();
 
-    // Create test nodes
+    // Create test nodes.
     $this->node1 = $this->drupalCreateNode(array('type' => $this->content_type->type));
     $this->node2 = $this->drupalCreateNode(array('type' => $this->content_type->type));
   }
 
   /**
-   * Test for viewing nodes
+   * Test for viewing nodes.
    */
   function testViewAccess() {
-    // Restrict access to the content type (access is only allowed for the author)
+    // Restrict access to the content type (access is only allowed for the
+    // author).
     $access_permissions = array(
       'view[1]' => FALSE,
       'view[2]' => FALSE,
     );
     $this->changeAccessContentType($access_permissions);
 
-    // Logout admin and try to access the node anonymously
+    // Logout admin and try to access the node anonymously.
     $this->drupalLogout();
-    $this->drupalGet('node/'. $this->node1->nid);
+    $this->drupalGet('node/' . $this->node1->nid);
     $this->assertText(t('Access denied'), 'node is not viewable');
 
-    // Login test user, view node, access must be denied
+    // Login test user, view node, access must be denied.
     $this->drupalLogin($this->test_user);
-    $this->drupalGet('node/'. $this->node1->nid);
+    $this->drupalGet('node/' . $this->node1->nid);
     $this->assertText(t('Access denied'), 'node is not viewable');
 
-    // Login admin and grant access for viewing to the test user
+    // Login admin and grant access for viewing to the test user.
     $this->drupalLogin($this->admin_user);
     $this->changeAccessContentTypeKeyword('view');
 
-    // Logout admin and try to access the node anonymously
-    // access must be denied again
+    // Logout admin and try to access the node anonymously.
+    // Access must be denied again.
     $this->drupalLogout();
-    $this->drupalGet('node/'. $this->node1->nid);
+    $this->drupalGet('node/' . $this->node1->nid);
     $this->assertText(t('Access denied'), 'node is not viewable');
 
-    // Login test user, view node, access must be granted
+    // Login test user, view node, access must be granted.
     $this->drupalLogin($this->test_user);
-    $this->drupalGet('node/'. $this->node1->nid);
+    $this->drupalGet('node/' . $this->node1->nid);
     $this->assertNoText(t('Access denied'), 'node is viewable');
 
-    // Login admin and enable per node access
+    // Login admin and enable per node access.
     $this->drupalLogin($this->admin_user);
     $this->changeAccessPerNode();
 
-    // Restrict access on node2 for the test user role
+    // Restrict access on node2 for the test user role.
     $this->changeAccessNodeKeyword($this->node2, 'view', FALSE);
 
-    // Logout admin and try to access both nodes anonymously
+    // Logout admin and try to access both nodes anonymously.
     $this->drupalLogout();
-    $this->drupalGet('node/'. $this->node1->nid);
+    $this->drupalGet('node/' . $this->node1->nid);
     $this->assertText(t('Access denied'), 'node1 is not viewable');
-    $this->drupalGet('node/'. $this->node2->nid);
+    $this->drupalGet('node/' . $this->node2->nid);
     $this->assertText(t('Access denied'), 'node2 is not viewable');
 
-    // Login test user, view node1, access must be granted
+    // Login test user, view node1, access must be granted.
     $this->drupalLogin($this->test_user);
-    $this->drupalGet('node/'. $this->node1->nid);
+    $this->drupalGet('node/' . $this->node1->nid);
     $this->assertNoText(t('Access denied'), 'node1 is viewable');
 
-    // View node2, access must be denied
-    $this->drupalGet('node/'. $this->node2->nid);
+    // View node2, access must be denied.
+    $this->drupalGet('node/' . $this->node2->nid);
     $this->assertText(t('Access denied'), 'node2 is not viewable');
 
-    // Login admin, swap permissions between content type and node2
+    // Login admin, swap permissions between content type and node2.
     $this->drupalLogin($this->admin_user);
 
-    // Restrict access to content type
+    // Restrict access to content type.
     $this->changeAccessContentTypeKeyword('view', FALSE);
 
-    // Grant access to node2
+    // Grant access to node2.
     $this->changeAccessNodeKeyword($this->node2, 'view');
 
-    // Logout admin and try to access both nodes anonymously
+    // Logout admin and try to access both nodes anonymously.
     $this->drupalLogout();
-    $this->drupalGet('node/'. $this->node1->nid);
+    $this->drupalGet('node/' . $this->node1->nid);
     $this->assertText(t('Access denied'), 'node1 is not viewable');
-    $this->drupalGet('node/'. $this->node2->nid);
+    $this->drupalGet('node/' . $this->node2->nid);
     $this->assertText(t('Access denied'), 'node2 is not viewable');
 
-    // Login test user, view node1, access must be denied
+    // Login test user, view node1, access must be denied.
     $this->drupalLogin($this->test_user);
-    $this->drupalGet('node/'. $this->node1->nid);
+    $this->drupalGet('node/' . $this->node1->nid);
     $this->assertText(t('Access denied'), 'node1 is not viewable');
 
-    // View node2, access must be granted
-    $this->drupalGet('node/'. $this->node2->nid);
+    // View node2, access must be granted.
+    $this->drupalGet('node/' . $this->node2->nid);
     $this->assertNoText(t('Access denied'), 'node2 is viewable');
   }
 
   /**
-   * Test for editing nodes
+   * Test for editing nodes.
    */
   function testEditAccess() {
-    // Logout admin and try to edit the node anonymously
+    // Logout admin and try to edit the node anonymously.
     $this->drupalLogout();
-    $this->drupalGet('node/'. $this->node1->nid .'/edit');
+    $this->drupalGet('node/' . $this->node1->nid . '/edit');
     $this->assertText(t('Access denied'), 'edit access denied for anonymous');
 
-    // Login test user, edit node, access must be denied
+    // Login test user, edit node, access must be denied.
     $this->drupalLogin($this->test_user);
-    $this->drupalGet('node/'. $this->node1->nid .'/edit');
+    $this->drupalGet('node/' . $this->node1->nid . '/edit');
     $this->assertText(t('Access denied'), 'edit access denied for test user');
 
-    // Login admin and grant access for editing to the test user
+    // Login admin and grant access for editing to the test user.
     $this->drupalLogin($this->admin_user);
     $this->changeAccessContentTypeKeyword('update');
 
-    // Logout admin and try to edit the node anonymously
-    // access must be denied again
+    // Logout admin and try to edit the node anonymously.
+    // Access must be denied again.
     $this->drupalLogout();
-    $this->drupalGet('node/'. $this->node1->nid .'/edit');
+    $this->drupalGet('node/' . $this->node1->nid . '/edit');
     $this->assertText(t('Access denied'), 'edit access denied for anonymous');
 
-    // Login test user, edit node, access must be granted
+    // Login test user, edit node, access must be granted.
     $this->drupalLogin($this->test_user);
-    $this->drupalGet('node/'. $this->node1->nid .'/edit');
+    $this->drupalGet('node/' . $this->node1->nid . '/edit');
     $this->assertNoText(t('Access denied'), 'node1 is editable');
 
-    // Login admin and enable per node access
+    // Login admin and enable per node access.
     $this->drupalLogin($this->admin_user);
     $this->changeAccessPerNode();
 
-    // Restrict access for this content type for the test user
+    // Restrict access for this content type for the test user.
     $this->changeAccessContentTypeKeyword('update', FALSE);
 
-    // Allow acces for node1 only
+    // Allow acces for node1 only.
     $this->changeAccessNodeKeyword($this->node1, 'update');
 
-    // Logout admin and try to edit both nodes anonymously
+    // Logout admin and try to edit both nodes anonymously.
     $this->drupalLogout();
-    $this->drupalGet('node/'. $this->node1->nid .'/edit');
+    $this->drupalGet('node/' . $this->node1->nid . '/edit');
     $this->assertText(t('Access denied'), 'node1 is not editable');
-    $this->drupalGet('node/'. $this->node2->nid .'/edit');
+    $this->drupalGet('node/' . $this->node2->nid . '/edit');
     $this->assertText(t('Access denied'), 'node2 is not editable');
 
-    // Login test user, edit node1, access must be granted
+    // Login test user, edit node1, access must be granted.
     $this->drupalLogin($this->test_user);
-    $this->drupalGet('node/'. $this->node1->nid .'/edit');
+    $this->drupalGet('node/' . $this->node1->nid . '/edit');
     $this->assertNoText(t('Access denied'), 'node1 is editable');
 
-    // Edit node2, access must be denied
-    $this->drupalGet('node/'. $this->node2->nid .'/edit');
+    // Edit node2, access must be denied.
+    $this->drupalGet('node/' . $this->node2->nid . '/edit');
     $this->assertText(t('Access denied'), 'node2 is not editable');
 
-    // Login admin, swap permissions between node1 and node2
+    // Login admin, swap permissions between node1 and node2.
     $this->drupalLogin($this->admin_user);
 
-    // Grant edit access to node2
+    // Grant edit access to node2.
     $this->changeAccessNodeKeyword($this->node2, 'update');
-    // Restrict edit acces to node1
+    // Restrict edit acces to node1.
     $this->changeAccessNodeKeyword($this->node1, 'update', FALSE);
 
-    // Logout admin and try to edit both nodes anonymously
+    // Logout admin and try to edit both nodes anonymously.
     $this->drupalLogout();
-    $this->drupalGet('node/'. $this->node1->nid .'/edit');
+    $this->drupalGet('node/' . $this->node1->nid . '/edit');
     $this->assertText(t('Access denied'), 'node1 is not editable');
-    $this->drupalGet('node/'. $this->node2->nid .'/edit');
+    $this->drupalGet('node/' . $this->node2->nid . '/edit');
     $this->assertText(t('Access denied'), 'node2 is not editable');
 
-    // Login test user, edit node1, access must be denied
+    // Login test user, edit node1, access must be denied.
     $this->drupalLogin($this->test_user);
-    $this->drupalGet('node/'. $this->node1->nid .'/edit');
+    $this->drupalGet('node/' . $this->node1->nid . '/edit');
     $this->assertText(t('Access denied'), 'node1 is not editable');
 
-    // Edit node2, access must be granted
-    $this->drupalGet('node/'. $this->node2->nid .'/edit');
+    // Edit node2, access must be granted.
+    $this->drupalGet('node/' . $this->node2->nid . '/edit');
     $this->assertNoText(t('Access denied'), 'node2 is editable');
   }
 
   /**
-   * Test for deleting nodes
+   * Test for deleting nodes.
    */
   function testDeleteAccess() {
-    // Logout admin and try to delete the node anonymously
+    // Logout admin and try to delete the node anonymously.
     $this->drupalLogout();
-    $this->drupalGet('node/'. $this->node1->nid .'/delete');
+    $this->drupalGet('node/' . $this->node1->nid . '/delete');
     $this->assertText(t('Access denied'), 'delete access denied for anonymous');
 
-    // Login test user, delete node, access must be denied
+    // Login test user, delete node, access must be denied.
     $this->drupalLogin($this->test_user);
-    $this->drupalGet('node/'. $this->node1->nid .'/delete');
+    $this->drupalGet('node/' . $this->node1->nid . '/delete');
     $this->assertText(t('Access denied'), 'delete access denied for test user');
 
-    // Login admin and grant access for deleting to the test user
+    // Login admin and grant access for deleting to the test user.
     $this->drupalLogin($this->admin_user);
 
     $this->changeAccessContentTypeKeyword('delete');
 
-    // Logout admin and try to edit the node anonymously
-    // access must be denied again
+    // Logout admin and try to edit the node anonymously.
+    // Access must be denied again.
     $this->drupalLogout();
-    $this->drupalGet('node/'. $this->node1->nid .'/delete');
+    $this->drupalGet('node/' . $this->node1->nid . '/delete');
     $this->assertText(t('Access denied'), 'delete access denied for anonymous');
 
-    // Login test user, delete node, access must be granted
+    // Login test user, delete node, access must be granted.
     $this->drupalLogin($this->test_user);
-    $this->drupalPost('node/'. $this->node1->nid .'/delete', array(), 'Delete');
+    $this->drupalPost('node/' . $this->node1->nid . '/delete', array(), 'Delete');
     $this->assertRaw(t('%node has been deleted', array('%node' => $this->node1->title)), 'Test node was deleted successfully by test user');
 
-    // Login admin and recreate test node1
+    // Login admin and recreate test node1.
     $this->drupalLogin($this->admin_user);
     $this->node1 = $this->drupalCreateNode(array('type' => $this->content_type->type));
 
-    // Enable per node access
+    // Enable per node access.
     $this->changeAccessPerNode();
 
-    // Restrict access for this content type for the test user
+    // Restrict access for this content type for the test user.
     $this->changeAccessContentTypeKeyword('delete', FALSE);
 
-    // Allow acces for node1 only
+    // Allow acces for node1 only.
     $this->changeAccessNodeKeyword($this->node1, 'delete');
 
-    // Logout admin and try to delete both nodes anonymously
+    // Logout admin and try to delete both nodes anonymously.
     $this->drupalLogout();
-    $this->drupalGet('node/'. $this->node1->nid .'/delete');
+    $this->drupalGet('node/' . $this->node1->nid . '/delete');
     $this->assertText(t('Access denied'), 'node1 is not deletable');
-    $this->drupalGet('node/'. $this->node2->nid .'/delete');
+    $this->drupalGet('node/' . $this->node2->nid . '/delete');
     $this->assertText(t('Access denied'), 'node2 is not deletable');
 
-    // Login test user, delete node1, access must be granted
+    // Login test user, delete node1, access must be granted.
     $this->drupalLogin($this->test_user);
-    $this->drupalGet('node/'. $this->node1->nid .'/delete');
+    $this->drupalGet('node/' . $this->node1->nid . '/delete');
     $this->assertNoText(t('Access denied'), 'node1 is deletable');
 
-    // Delete node2, access must be denied
-    $this->drupalGet('node/'. $this->node2->nid .'/delete');
+    // Delete node2, access must be denied.
+    $this->drupalGet('node/' . $this->node2->nid . '/delete');
     $this->assertText(t('Access denied'), 'node2 is not deletable');
 
-    // Login admin, swap permissions between node1 and node2
+    // Login admin, swap permissions between node1 and node2.
     $this->drupalLogin($this->admin_user);
 
-    // Grant delete access to node2
+    // Grant delete access to node2.
     $this->changeAccessNodeKeyword($this->node2, 'delete');
-    // Restrict delete acces to node1
+    // Restrict delete acces to node1.
     $this->changeAccessNodeKeyword($this->node1, 'delete', FALSE);
 
-    // Logout admin and try to delete both nodes anonymously
+    // Logout admin and try to delete both nodes anonymously.
     $this->drupalLogout();
-    $this->drupalGet('node/'. $this->node1->nid .'/delete');
+    $this->drupalGet('node/' . $this->node1->nid . '/delete');
     $this->assertText(t('Access denied'), 'node1 is not deletable');
-    $this->drupalGet('node/'. $this->node2->nid .'/delete');
+    $this->drupalGet('node/' . $this->node2->nid . '/delete');
     $this->assertText(t('Access denied'), 'node2 is not deletable');
 
-    // Login test user, delete node1, access must be denied
+    // Login test user, delete node1, access must be denied.
     $this->drupalLogin($this->test_user);
-    $this->drupalGet('node/'. $this->node1->nid .'/delete');
+    $this->drupalGet('node/' . $this->node1->nid . '/delete');
     $this->assertText(t('Access denied'), 'node1 is not deletable');
 
-    // Delete node2, access must be granted
-    $this->drupalGet('node/'. $this->node2->nid .'/delete');
+    // Delete node2, access must be granted.
+    $this->drupalGet('node/' . $this->node2->nid . '/delete');
     $this->assertNoText(t('Access denied'), 'node2 is deletable');
   }
 
   /**
-   * Test own view access
+   * Test own view access.
    */
   function testOwnViewAccess() {
-    // Setup 2 test users
+    // Setup 2 test users.
     $test_user1 = $this->test_user;
-    $test_user2 = $this->drupalCreateUser();
+    $test_user2 = $this->drupalCreateUser(array('access content'));
 
-    // Change ownership of test nodes to test users
+    // Change ownership of test nodes to test users.
     $this->node1->uid = $test_user1->uid;
     node_save($this->node1);
     $this->node2->uid = $test_user2->uid;
     node_save($this->node2);
 
-    // Remove all view permissions for this content type
+    // Remove all view permissions for this content type.
     $access_permissions = array(
       'view[1]' => FALSE,
       'view[2]' => FALSE,
@@ -300,33 +301,33 @@ class ContentAccessModuleTestCase extends ContentAccessTestCase {
     );
     $this->changeAccessContentType($access_permissions);
 
-    // Allow view own content for test user 1 and 2 roles
+    // Allow view own content for test user 1 and 2 roles.
     $this->changeAccessContentTypeKeyword('view_own', TRUE, $test_user1);
     $this->changeAccessContentTypeKeyword('view_own', TRUE, $test_user2);
 
-    // Logout admin and try to access both nodes anonymously
+    // Logout admin and try to access both nodes anonymously.
     $this->drupalLogout();
-    $this->drupalGet('node/'. $this->node1->nid);
+    $this->drupalGet('node/' . $this->node1->nid);
     $this->assertText(t('Access denied'), 'node1 is not viewable');
-    $this->drupalGet('node/'. $this->node2->nid);
+    $this->drupalGet('node/' . $this->node2->nid);
     $this->assertText(t('Access denied'), 'node2 is not viewable');
 
-    // Login test user 1, view node1, access must be granted
+    // Login test user 1, view node1, access must be granted.
     $this->drupalLogin($test_user1);
-    $this->drupalGet('node/'. $this->node1->nid);
+    $this->drupalGet('node/' . $this->node1->nid);
     $this->assertNoText(t('Access denied'), 'node1 is viewable');
 
-    // View node2, access must be denied
-    $this->drupalGet('node/'. $this->node2->nid);
+    // View node2, access must be denied.
+    $this->drupalGet('node/' . $this->node2->nid);
     $this->assertText(t('Access denied'), 'node2 is not viewable');
 
-    // Login test user 2, view node1, access must be denied
+    // Login test user 2, view node1, access must be denied.
     $this->drupalLogin($test_user2);
-    $this->drupalGet('node/'. $this->node1->nid);
+    $this->drupalGet('node/' . $this->node1->nid);
     $this->assertText(t('Access denied'), 'node1 is not viewable');
 
-    // View node2, access must be granted
-    $this->drupalGet('node/'. $this->node2->nid);
+    // View node2, access must be granted.
+    $this->drupalGet('node/' . $this->node2->nid);
     $this->assertNoText(t('Access denied'), 'node2 is viewable');
   }
-}
\ No newline at end of file
+}
diff --git a/tests/content_access_test_help.php b/tests/content_access_test_help.php
index 0334967..7c714cb 100644
--- a/tests/content_access_test_help.php
+++ b/tests/content_access_test_help.php
@@ -34,19 +34,16 @@ class ContentAccessTestCase extends DrupalWebTestCase {
       }
     }
 
-    // Create test user with seperate role
-    $this->test_user = $this->drupalCreateUser();
+    // Create test user with separate role.
+    $this->test_user = $this->drupalCreateUser(array('access content'));
 
-    // Get the value of the new role
-    // Needed in D7 because it's by default create two roles for new users
-    // one role is Authenticated and the second is new default one
+    // Get the value of the new role.
+    // Needed in D7 because drupalCreateUser() creates two roles for new users:
+    // one role is Authenticated and the second has the given permissions.
     // @see drupalCreateUser()
-    foreach ($this->test_user->roles as $rid => $role) {
-      if (!in_array($rid, array(DRUPAL_AUTHENTICATED_RID))) {
-        $this->rid = $rid;
-        break;
-      }
-    }
+    $roles = $this->test_user->roles;
+    unset($roles[DRUPAL_AUTHENTICATED_RID]);
+    $this->rid = key($roles);
 
     // Create admin user
     $this->admin_user = $this->drupalCreateUser(array('access content', 'administer content types', 'grant content access', 'grant own content access', 'administer nodes', 'access administration pages'));
@@ -122,4 +119,4 @@ class ContentAccessTestCase extends DrupalWebTestCase {
     $this->drupalPost('node/'. $node->nid .'/access', $access_settings, t('Submit'));
     $this->assertText(t('Your changes have been saved.'), 'access rules of node were updated successfully');
   }
-}
\ No newline at end of file
+}