diff --git a/og.test b/og.test
index 58e9299..d5a072a 100644
--- a/og.test
+++ b/og.test
@@ -1117,7 +1117,7 @@ class OgTokensTestCase extends DrupalWebTestCase {
     module_enable(array('entity_feature'));
 
     // Add a new content type for groups, and attach group field
-    $this->group_node_type = $this->drupalCreateContentType( array( 'name' => 'group' ) );
+    $this->group_node_type = $this->drupalCreateContentType(array( 'name' => 'group' ));
     og_create_field(OG_GROUP_FIELD, 'node', 'group');
 
     // Add OG group field to the entity_test's "main" bundle.
@@ -1134,36 +1134,33 @@ class OgTokensTestCase extends DrupalWebTestCase {
     $entity->save();
     $group = og_get_group('entity_test', $entity->pid);
 
-    $this->assertEqual(token_replace("[group:gid]", array("group" => $group) ), $group->gid, t('Generation of "[group:gid]" token for entity groups'));
-    $this->assertEqual(token_replace("[group:label]", array("group" => $group) ), $group->label, t('Generation of "[group:label]" token for entity groups'));
+    $this->assertEqual(token_replace("[group:gid]", array("group" => $group) ), $group->gid, t('Generation of "[group:gid]" token for entity groups.'));
+    $this->assertEqual(token_replace("[group:label]", array("group" => $group) ), $group->label, t('Generation of "[group:label]" token for entity groups.'));
+
+    // Test group uri token
     $uri = entity_uri('entity_test', $entity);
-    $this->assertEqual(token_replace("[group:url]", array("group" => $group) ), url($uri['path'],array('absolute' => TRUE)), t('Generation of "[group:url]" token for entity groups'));
-    $this->assertEqual(
-      token_replace("[group:created]", array("group" => $group) ),
-      format_date($group->created, 'medium'),
-      t('Generation of "[group:created]" token for entity groups')
-    );
+    $good = url($uri['path'], array('absolute' => TRUE));
+    $result = token_replace("[group:url]", array("group" => $group));
+    $this->assertEqual($result, $good, t('Generation of "[group:url]" token for entity groups.'));
+
+    // Test group creation time token
+    $good = format_date($group->created, 'medium');
+    $result = token_replace("[group:created]", array("group" => $group) );
+    $this->assertEqual($result, $good, t('Generation of "[group:created]" token for entity groups.'));
 
     // Test token chaining on created subtoken (date)
-    $this->assertEqual(
-      token_replace("[group:created:raw]", array("group" => $group) ),
-      token_replace("[date:raw]", array("date" => $group->created) ),
-      t('Generation of "[group:created:raw]" token for entity groups')
-    );
+    $result = token_replace("[group:created:raw]", array("group" => $group));
+    $good = token_replace("[date:raw]", array("date" => $group->created));
+    $this->assertEqual($result, $good, t('Generation of "[group:created:raw]" token for entity groups.'));
 
-    // Test token chaining on node subtoken (node)
-    $this->assertEqual(
-      token_replace("[group:node:title]", array("group" => $group) ),
-      "[group:node:title]", // unreplaced, group entity is not a node
-      t('Generation of "[group:node:title]" token for entity groups')
-    );
+    // Test token chaining on node subtoken (result should be the unreplaced token)
+    $result = token_replace("[group:node:title]", array("group" => $group));
+    $this->assertEqual($result, "[group:node:title]", t('Generation of "[group:node:title]" token for entity groups.'));
 
-    // Test token chaining on manager subtoken (user)
-    $this->assertEqual(
-      token_replace("[group:manager:uid]", array("group" => $group) ),
-      token_replace("[user:uid]", array("user" => $admin_user) ),
-      t('Generation of "[group:manager:uid]" token for entity groups')
-    );
+    // Test token chaining on manager subtoken
+    $result = token_replace("[group:manager:uid]", array("group" => $group));
+    $good =  token_replace("[user:uid]", array("user" => $admin_user));
+    $this->assertEqual($result, $good, t('Generation of "[group:manager:uid]" token for entity groups.'));
   }
 
   function testOgNodeGroupTokens() {
@@ -1185,36 +1182,34 @@ class OgTokensTestCase extends DrupalWebTestCase {
       OG_AUDIENCE_FIELD => array( LANGUAGE_NONE => array( array( 'gid' => $group->gid ) ) ),
     ));
 
-    $this->assertEqual(token_replace("[group:gid]", array("group" => $group) ), $group->gid, t('Generation of "[group:gid]" token for node groups'));
-    $this->assertEqual(token_replace("[group:label]", array("group" => $group) ), $group->label, t('Generation of "[group:label]" token for node groups'));
+    $this->assertEqual(token_replace("[group:gid]", array("group" => $group) ), $group->gid, t('Generation of "[group:gid]" token for node groups.'));
+    $this->assertEqual(token_replace("[group:label]", array("group" => $group) ), $group->label, t('Generation of "[group:label]" token for node groups.'));
+
+    // Test group uri token
     $uri = entity_uri('node', $gnode);
-    $this->assertEqual(token_replace("[group:url]", array("group" => $group) ), url($uri['path'], array('absolute' => TRUE)), t('Generation of "[group:url]" token for node groups'));
-    $this->assertEqual(
-      token_replace("[group:created]", array("group" => $group) ),
-      format_date($group->created, 'medium'),
-      t('Generation of "[group:created]" token for node groups')
-    );
+    $good = url($uri['path'], array('absolute' => TRUE));
+    $result = token_replace("[group:url]", array("group" => $group));
+    $this->assertEqual($result, $good, t('Generation of "[group:url]" token for node groups.'));
+
+    // Test group creation time token
+    $good = format_date($group->created, 'medium');
+    $result = token_replace("[group:created]", array("group" => $group) );
+    $this->assertEqual($result, $good, t('Generation of "[group:created]" token for node groups.'));
 
     // Test token chaining on created subtoken (date)
-    $this->assertEqual(
-      token_replace("[group:created:raw]", array("group" => $group) ),
-      token_replace("[date:raw]", array("date" => $group->created) ),
-      t('Generation of "[group:created:raw]" token for node groups')
-    );
+    $result = token_replace("[group:created:raw]", array("group" => $group));
+    $good = token_replace("[date:raw]", array("date" => $group->created));
+    $this->assertEqual($result, $good, t('Generation of "[group:created:raw]" token for node groups.'));
 
     // Test token chaining on node subtoken
-    $this->assertEqual(
-      token_replace("[group:node:title]", array("group" => $group) ),
-      token_replace("[node:title]", array("node" => $gnode) ),
-      t('Generation of "[group:node:title]" token for node groups')
-    );
+    $result = token_replace("[group:node:title]", array("group" => $group));
+    $good = token_replace("[node:title]", array("node" => $gnode));
+    $this->assertEqual($result, $good, t('Generation of "[group:node:title]" token for node groups.'));
 
     // Test token chaining on manager subtoken
-    $this->assertEqual(
-      token_replace("[group:manager:uid]", array("group" => $group) ),
-      token_replace("[user:uid]", array("user" => $admin_user) ),
-      t('Generation of "[group:manager:uid]" token for node groups')
-    );
+    $result = token_replace("[group:manager:uid]", array("group" => $group));
+    $good =  token_replace("[user:uid]", array("user" => $admin_user));
+    $this->assertEqual($result, $good, t('Generation of "[group:manager:uid]" token for node groups.'));
   }
 
 }
diff --git a/og.tokens.inc b/og.tokens.inc
index 9f7e9b9..a822046 100644
--- a/og.tokens.inc
+++ b/og.tokens.inc
@@ -43,7 +43,7 @@ function og_token_info() {
   );
 
   $group['manager'] = array(
-    'name' => t('Manager user'),
+    'name' => t('Group manager user'),
     'description' => t('Tokens related to the group manager user.'),
     'type' => 'user',
   );