diff --git a/tests/protected_node.mail.test b/tests/protected_node.mail.test
index e863b2e..adab68c 100644
--- a/tests/protected_node.mail.test
+++ b/tests/protected_node.mail.test
@@ -14,9 +14,9 @@ class ProtectedNodeMail extends ProtectedNodeBaseTestCase {
    */
   public static function getInfo() {
     return array(
-        'name' => 'Protected node email feature',
-        'description' => "This tests mail features",
-        'group' => 'Protected Node',
+      'name' => 'Protected node email feature',
+      'description' => "This tests mail features",
+      'group' => 'Protected Node',
     );
   }
 
@@ -25,14 +25,13 @@ class ProtectedNodeMail extends ProtectedNodeBaseTestCase {
    */
   public function setUp() {
     parent::setUp();
-    $this->group = 'Protected node';
 
     // Log in an Admin.
     $this->drupalLogin($this->adminUser);
     // Submit the configuration form.
     $protected_node_settings = array(
-        'protected_node_use_global_password' => PROTECTED_NODE_PER_NODE_PASSWORD,
-        'protected_node_email_activation' => 1
+      'protected_node_use_global_password' => PROTECTED_NODE_PER_NODE_PASSWORD,
+      'protected_node_email_activation' => 1
     );
     $this->drupalPost('admin/config/content/protected_node', $protected_node_settings, t('Save configuration'));
   }
@@ -74,12 +73,12 @@ class ProtectedNodeMail extends ProtectedNodeBaseTestCase {
     // Add a new page node that is protected.
     $node_title = $this->randomName(8);
     $node_data = array(
-        'title' => $node_title,
-        'body[und][0][value]' => $this->randomName(32),
-        'protected_node_is_protected' => TRUE,
-        'protected_node_passwd[pass1]' => $password,
-        'protected_node_passwd[pass2]' => $password,
-        'protected_node_emails' => $to,
+      'title' => $node_title,
+      'body[und][0][value]' => $this->randomName(32),
+      'protected_node_is_protected' => TRUE,
+      'protected_node_passwd[pass1]' => $password,
+      'protected_node_passwd[pass2]' => $password,
+      'protected_node_emails' => $to,
     );
     $this->drupalPost('node/add/page', $node_data, t('Save'));
 
diff --git a/tests/protected_node.per_node.test b/tests/protected_node.per_node.test
index d454276..86980e2 100644
--- a/tests/protected_node.per_node.test
+++ b/tests/protected_node.per_node.test
@@ -25,7 +25,6 @@ class ProtectedNodePerNodePassword extends ProtectedNodeBaseTestCase {
    */
   public function setUp() {
     parent::setUp();
-    $this->group = 'Protected node';
 
     // Log in an Admin.
     $this->drupalLogin($this->adminUser);
diff --git a/tests/protected_node.per_type.test b/tests/protected_node.per_type.test
index 475eb3f..e623992 100644
--- a/tests/protected_node.per_type.test
+++ b/tests/protected_node.per_type.test
@@ -25,13 +25,11 @@ class ProtectedNodePerTypePassword extends ProtectedNodeBaseTestCase {
    */
   public function setUp() {
     parent::setUp();
-    $this->group = 'Protected node';
 
     // Log in an Admin.
     $this->drupalLogin($this->adminUser);
-    /**
-     * Configure protected node.
-     */
+
+    // Configure protected node.
     // Generate random password for form validation. This password is not used.
     $another_password = $this->randomName(12);
     // Submit the configuration form.
@@ -42,9 +40,7 @@ class ProtectedNodePerTypePassword extends ProtectedNodeBaseTestCase {
     );
     $this->drupalPost('admin/config/content/protected_node', $protected_node_settings, t('Save configuration'));
 
-    /**
-     * Configure page content type.
-     */
+    // Configure page content type.
     // Generate random password.
     $this->page_content_type_password = $this->randomName(10);
     // Submit the configuration form.
diff --git a/tests/protected_node.test b/tests/protected_node.test
index 8800619..34aa63d 100644
--- a/tests/protected_node.test
+++ b/tests/protected_node.test
@@ -15,9 +15,11 @@ class ProtectedNodeBaseTestCase extends DrupalWebTestCase {
    */
   public function setUp() {
     parent::setUp('protected_node');
-    /**
-     * User with all needed permissions.
-     */
+
+    // Set the group.
+    $this->group = 'Protected node';
+
+    // User with all needed permissions.
     $this->adminUser = $this->drupalCreateUser(array(
       'access protected content',
       'edit any password',
@@ -28,13 +30,11 @@ class ProtectedNodeBaseTestCase extends DrupalWebTestCase {
       'bypass node access',
       'administer content types',
     ));
-    /**
-     * User with access protected node permission.
-     */
+
+    // User with access protected node permission.
     $this->normalAccessAllowedUser = $this->drupalCreateUser(array('access protected content'));
-    /**
-     * User with view published content permission.
-     */
+
+    // User with view published content permission.
     $this->normalNonAccessAllowedUser = $this->drupalCreateUser(array('access content'));
   }