diff --git a/lib/WebGUI/Asset.pm b/lib/WebGUI/Asset.pm
index 80986ce39..75eb5317a 100644
--- a/lib/WebGUI/Asset.pm
+++ b/lib/WebGUI/Asset.pm
@@ -218,7 +218,7 @@ sub canAdd {
     my $user = WebGUI::User->new($session, $userId);
     my $subclassGroupId = shift;
     my $addPrivs = $session->config->get("assets/".$className."/addGroup");
-    my $groupId = $addPrivs->{$className} || $subclassGroupId || '12';
+    my $groupId = $addPrivs || $subclassGroupId || '12';
     return $user->isInGroup($groupId);
 }
 
@@ -1014,10 +1014,10 @@ Please see the example below for adding 1 tab.
 sub getEditTabs {
 	my $self = shift;
 	my $i18n = WebGUI::International->new($self->session, "Asset");
-	return ["properties", $i18n->get("properties"), 1],
+	return (["properties", $i18n->get("properties"), 1],
 		["display", $i18n->get(105), 5],
 		["security", $i18n->get(107), 6],
-		["meta", $i18n->get("Metadata"), 3];
+		["meta", $i18n->get("Metadata"), 3]);
 }
 
 
diff --git a/t/Asset/Asset.t b/t/Asset/Asset.t
index a052663bc..6385fd0f6 100644
--- a/t/Asset/Asset.t
+++ b/t/Asset/Asset.t
@@ -36,6 +36,7 @@ my @fixTitleTests = getFixTitleTests($session);
 my @getTitleTests = getTitleTests($session);
 
 my $rootAsset = WebGUI::Asset->getRoot($session);
+my $originalAssetOverrides = $session->config->get('assets');
 
 ##Test users.
 ##All users in here will be deleted at the end of the test.  DO NOT PUT
@@ -490,22 +491,14 @@ TODO: {
 #
 ################################################################
 
-my $origAssetAddPrivileges = $session->config->get('assetAddPrivilege');
-$session->config->set('assetAddPrivilege', { 'WebGUI::Asset' => $testGroups{'canAdd asset'}->getId } );
+$session->config->set('assets/WebGUI::Asset/addGroup', $testGroups{'canAdd asset'}->getId );
 
 $canAddMaker->run;
 
-diag 'Without proper group setup, Turn On Admin is excluded from adding assets via assetAddPrivilege';
+diag 'Without proper group setup, Turn On Admin is excluded from adding assets via assets/WebGUI::Asset/groupAdd';
 
 $canAddMaker2->run;
 
-if (defined $origAssetAddPrivileges) {
-    $session->config->set('assetAddPrivilege', $origAssetAddPrivileges);
-}
-else {
-    $session->config->delete('assetUiLevel');
-}
-
 ################################################################
 #
 # canEdit
@@ -587,21 +580,12 @@ is($canEditAsset->getUiLevel,  1, 'getUiLevel: WebGUI::Asset uses the default ui
 is($fixTitleAsset->getUiLevel, 5, 'getUiLevel: Snippet has an uiLevel of 5');
 
 my $origAssetUiLevel = $session->config->get('assetUiLevel');
-$session->config->set('assetUiLevel',
-                      {
-                        'WebGUI::Asset'          => 8,
-                        'WebGUI::Asset::Snippet' => 9,
-                      } );
+$session->config->set('assets/WebGUI::Asset/uiLevel', 8);
+$session->config->set('assets/WebGUI::Asset::Snippet/uiLevel', 8);
 
 is($canEditAsset->getUiLevel,  8, 'getUiLevel: WebGUI::Asset has a configured uiLevel of 8');
 is($fixTitleAsset->getUiLevel, 9, 'getUiLevel: Snippet has a configured uiLevel of 9');
 
-if (defined $origAssetUiLevel) {
-    $session->config->set('assetUiLevel', $origAssetUiLevel);
-}
-else {
-    $session->config->delete('assetUiLevel');
-}
 
 ################################################################
 #
@@ -638,7 +622,8 @@ is($canViewAsset->isValidRssItem, 1, 'isValidRssItem: By default, all Assets are
 #
 ################################################################
 
-is($canViewAsset->getEditTabs, undef, 'getEditTabs: No extra tabs by default');
+my @tabs = $canViewAsset->getEditTabs;
+is(scalar(@tabs), 4, 'getEditTabs: 4 tabs by default');
 
 ################################################################
 #
@@ -819,17 +804,8 @@ END {
         if defined $origUrlExtension;
     $session->setting->set('notFoundPage', $origNotFoundPage)
         if defined $origNotFoundPage;
-    if (defined $origAssetAddPrivileges) {
-        $session->config->set('assetAddPrivilege', $origAssetAddPrivileges);
-    }
-    else {
-        $session->config->delete('assetUiLevel');
-    }
-    if (defined $origAssetUiLevel) {
-        $session->config->set('assetUiLevel', $origAssetUiLevel);
-    }
-    else {
-        $session->config->delete('assetUiLevel');
+    if (defined $originalAssetOverrides) {
+        $session->config->set('assets', $originalAssetOverrides);
     }
     foreach my $vTag ($versionTag, $versionTag2, $versionTag3, $versionTag4, ) {
         $vTag->rollback;