diff --git a/og_access/og_access.test b/og_access/og_access.test
index 21aedcb7..8e458fdb 100644
--- a/og_access/og_access.test
+++ b/og_access/og_access.test
@@ -10,6 +10,32 @@
  */
 class OgAccessTestCase extends BackdropWebTestCase {
 
+
+  /**
+   * @var User
+   */
+  protected $user1;
+
+  /**
+   * @var User
+   */
+  protected $user2;
+
+  /**
+   * @var stdClass
+   */
+  protected $group_type;
+
+  /**
+   * @var Node
+   */
+  protected $group_node;
+  
+  /**
+   * @var stdClass
+   */
+  protected $group_content_type;
+
   function setUp() {
     parent::setUp('og_access');
     node_access_rebuild();
@@ -346,6 +372,21 @@ class OgAccessTestCase extends BackdropWebTestCase {
  */
 class OgAccessUseGroupDefaultsTestCase extends BackdropWebTestCase {
 
+  /**
+   * @var stdClass
+   */
+  protected $group_type;
+
+  /**
+   * @var Node
+   */
+  protected $group_node;
+  
+  /**
+   * @var stdClass
+   */
+  protected $group_content_type;
+
   function setUp() {
     parent::setUp('og_access');
     node_access_rebuild();
@@ -397,6 +438,16 @@ class OgAccessUseGroupDefaultsTestCase extends BackdropWebTestCase {
  */
 class OgAccessModeratedGroup extends BackdropWebTestCase {
 
+  /**
+   * @var Node
+   */
+  protected $group;
+
+  /**
+   * @var User
+   */
+  protected $user;
+
   public function setUp() {
     parent::setUp(array('og', 'og_access', 'og_ui'));
     node_access_rebuild();
diff --git a/og_context/og_context.test b/og_context/og_context.test
index aa324459..2e55fadb 100644
--- a/og_context/og_context.test
+++ b/og_context/og_context.test
@@ -10,6 +10,31 @@
  */
 class OgContextTestCase extends BackdropWebTestCase {
 
+  /**
+   * @var User
+   */
+  protected $user1;
+
+  /**
+   * @var User
+   */
+  protected $user2;
+
+  /**
+   * @var stdClass
+   */
+  protected $group_type;
+
+  /**
+   * @var Node
+   */
+  protected $group_node;
+  
+  /**
+   * @var stdClass
+   */
+  protected $group_content_type;
+
   function setUp() {
     parent::setUp('og_context', 'og_access');
     node_access_rebuild();
diff --git a/tests/og.test b/tests/og.test
index f664b33b..51c408fd 100644
--- a/tests/og.test
+++ b/tests/og.test
@@ -136,6 +136,36 @@ class OgAccess extends OgTestBase {
  */
 class OgNodeAccess extends OgTestBase {
 
+  /**
+   * @var User
+   */
+  protected $editor_user;
+
+  /**
+   * @var User
+   */
+  protected $group_manager;
+
+  /**
+   * @var User
+   */
+  protected $group_editor_user;
+
+  /**
+   * @var Node
+   */
+  protected $group1;
+
+  /**
+   * @var Node
+   */
+  protected $group2;
+
+  /**
+   * @var Node
+   */
+  protected $group_content; 
+
   function setUp($modules = array()) {
     parent::setUp($modules);
 
@@ -1135,6 +1165,37 @@ class OgRoleRevoke extends OgTestBase {
  */
 class OgEntityFieldQueryTestCase extends OgTestBase {
 
+  /**
+   * @var User
+   */
+  protected $user1;
+
+  /**
+   * @var User
+   */
+  protected $user2;
+
+  /**
+   * @var Entity
+   */
+  protected $og_entity_test;
+
+  /**
+   * @var Node
+   */
+  protected $group1;
+
+  /**
+   * @var Node
+   */
+  protected $group2;
+
+  /**
+   * @var Node
+   */
+  protected $node;
+
+
   function setUp($modules = array()) {
     parent::setUp($modules);
 
@@ -1387,6 +1448,26 @@ class OgEntityFieldQueryTestCase extends OgTestBase {
  */
 class OgEntityFieldQueryFieldConditionTestCase extends OgTestBase {
 
+  /**
+   * @var stdClass
+   */
+  protected $group_type;
+
+  /**
+   * @var string
+   */
+  protected $group_content_type;
+
+  /**
+   * @var Node
+   */
+  protected $group1;
+
+  /**
+   * @var Node
+   */
+  protected $group2;
+
   function setUp($modules = array()) {
     parent::setUp($modules);
 
@@ -1577,6 +1658,11 @@ class OgAudienceFieldAutoCreateTestCase extends OgTestBase {
 
 class OgBehaviorHandlerTestCase extends OgTestBase {
 
+  /**
+   * @var string
+   */
+  protected $group_content;
+
   function setUp($modules = array()) {
     $modules[] = 'og_test';
     parent::setUp($modules);
@@ -2193,6 +2279,26 @@ class OgAutoCompleteAccessibleGroupsValidation extends OgTestBase {
  */
 class OgSelectAccessibleGroupsValidation extends OgTestBase {
 
+  /**
+   * @var User
+   */
+  protected $group_owner;
+
+  /**
+   * @var User
+   */
+  protected $group_member;
+
+  /**
+   * @var Node
+   */
+  protected $group_node_1;
+
+  /**
+   * @var Node
+   */
+  protected $group_node_2;
+
   function setUp($modules = array()) {
     parent::setUp($modules);
 
@@ -2300,14 +2406,24 @@ class OgAudienceFieldAccessOverrideTestCase extends OgTestBase {
  */
 class OgAudienceFieldDeltaTestCase extends OgTestBase {
 
+  /**
+   * @var stdClass
+   */
+  protected $groupType;
+
+  /**
+   * @var stdClass
+   */
+  protected $groupContentType;
+
   function setUp($modules = array()) {
     parent::setUp($modules);
 
     $this->groupType = $this->backdropCreateContentType();
     og_create_field(OG_GROUP_FIELD, 'node', $this->groupType->type);
 
-    $this->groupConentType = $this->backdropCreateContentType();
-    og_create_field(OG_AUDIENCE_FIELD, 'node', $this->groupConentType->type);
+    $this->groupContentType = $this->backdropCreateContentType();
+    og_create_field(OG_AUDIENCE_FIELD, 'node', $this->groupContentType->type);
   }
 
   /**
@@ -2316,7 +2432,7 @@ class OgAudienceFieldDeltaTestCase extends OgTestBase {
    */
   function testEntityMetadataWrapperForOgAudienceField() {
     $group = $this->backdropCreateNode(array('type' => $this->groupType->type));
-    $node = $this->backdropCreateNode(array('type' => $this->groupConentType->type));
+    $node = $this->backdropCreateNode(array('type' => $this->groupContentType->type));
 
     $wrapper = entity_metadata_wrapper('node', $node);
     $wrapper->{OG_AUDIENCE_FIELD}->set(array($group));