diff --git a/tests/workbench_access.test b/tests/workbench_access.test
index a6cc7fc..3be40e3 100644
--- a/tests/workbench_access.test
+++ b/tests/workbench_access.test
@@ -79,7 +79,7 @@ class WorkbenchAccessTestCase extends DrupalWebTestCase {
     $count = db_query("SELECT COUNT(n.nid) FROM {node} n INNER JOIN {workbench_access_node} wan ON n.nid = wan.nid WHERE wan.access_id = 'workbench_access' AND wan.access_scheme = 'taxonomy'")->fetchField();
     $this->assertTrue($count == 10, t('Initial nodes assigned to top-level hierarchy.'));
     // Test access settings of user 1.
-    $account = user_load(1);
+    $account = user_load(1, TRUE);
     $this->assertTrue(!empty($account->workbench_access['workbench_access']), t('User 1 assigned to top-level hierarchy.'));
     // End setup tests.
     
diff --git a/workbench_access.module b/workbench_access.module
index a08050d..63174f0 100644
--- a/workbench_access.module
+++ b/workbench_access.module
@@ -508,9 +508,9 @@ function workbench_access_tree($info, $keys = FALSE) {
  * Load the active tree.
  */
 function workbench_access_get_active_tree() {
-  $active = &drupal_static(__FUNCTION__);
-  if (isset($active['scheme'])) {
-    return $active;
+  $access_tree = &drupal_static(__FUNCTION__);
+  if (isset($access_tree['access_scheme'])) {
+    return $access_tree;
   }
   $scheme = variable_get('workbench_access', 'taxonomy');
   workbench_access_load_include($scheme);
@@ -520,12 +520,12 @@ function workbench_access_get_active_tree() {
   $active = workbench_access_get_ids_by_scheme($data);
   $tree = workbench_access_tree($data);
   workbench_access_build_tree($tree);
-  $active = array(
+  $access_tree = array(
     'access_scheme' => $data,
     'tree' => $tree,
     'active' => $active,
   );
-  return $active;
+  return $access_tree;
 }
 
 /**