3 files changed, 21 insertions, 14 deletions
diff --git a/install/ui/test/details_tests.js b/install/ui/test/details_tests.js
index c63a0af88..a79a194e4 100644
--- a/install/ui/test/details_tests.js
+++ b/install/ui/test/details_tests.js
@@ -40,7 +40,8 @@ module('details', {
         var obj_name = 'user';
         IPA.entity_factories.user=
             function(){
-                return IPA.entity({name:obj_name});
+                return IPA.entity({name:obj_name,
+                                   metadata:IPA.metadata.objects.user});
             };
         IPA.start_entities();
     },
@@ -160,12 +161,12 @@ test("Testing details lifecycle: create, setup, load.", function(){
             setup_called = true;
             widget.widget_setup(container);
         };
-        
+
         widget.load = function(record) {
             load_called = true;
             widget.widget_load(record);
         };
-        
+
         widget.save = function() {
             save_called = true;
             widget.widget_save();
@@ -201,13 +202,18 @@ test("Testing details lifecycle: create, setup, load.", function(){
     var facet = entity.get_facet('details');
     facet.init();
 
-    var content = $('<div/>', {
+    var container = $('<div/>', {
         'class': 'content'
     }).appendTo(container);
 
-    facet.create_content(content);
 
-    facet.setup(container);
+    entity.header = IPA.entity_header({entity:entity,container:container});
+    facet.entity_header = entity.header;
+    entity.header.reset();
+    facet.create_content(facet.entity_header.content);
+    facet.setup(facet.entity_header.content);
+
+
     facet.load(result);
 
     var contact = container.find('dl#contact.entryattrs');
diff --git a/install/ui/test/entity_tests.js b/install/ui/test/entity_tests.js
index bf071f877..471658235 100644
--- a/install/ui/test/entity_tests.js
+++ b/install/ui/test/entity_tests.js
@@ -73,13 +73,12 @@ test('Testing IPA.entity_set_search_definition().', function() {
     var facet = entity.get_facet('search');
     facet.init();
 
-    var content = $('<div/>', {
-        'class': 'content'
-    }).appendTo(entities_container);
+    var container = $("<div/>");
 
-    facet.create_content(content);
-
-    facet.setup(entities_container);
+    entity.header = IPA.entity_header({entity:entity,container:container});
+    facet.entity_header = entity.header;
+    facet.create_content(facet.entity_header.content);
+    facet.setup(facet.entity_header.content);
 
 
     var column = facet.get_columns()[0];
diff --git a/install/ui/test/navigation_tests.js b/install/ui/test/navigation_tests.js
index 7eb14ce40..d87edc64d 100644
--- a/install/ui/test/navigation_tests.js
+++ b/install/ui/test/navigation_tests.js
@@ -45,7 +45,8 @@ test("Testing IPA.nav.create().", function() {
     var entity;
 
     IPA.entity_factories.user =  function() {
-        var that = IPA.entity({name: 'user'});
+        var that = IPA.entity({name: 'user',
+                               metadata:IPA.metadata.objects.user});
         that.setup = function(container){
             user_mock_called = true;
             same(container[0].id,'user','user id');
@@ -54,7 +55,8 @@ test("Testing IPA.nav.create().", function() {
         return that;
     };
     IPA.entity_factories.group = function(){
-        var that  = IPA.entity({name: 'group'});
+        var that  = IPA.entity({name: 'group',
+                               metadata:IPA.metadata.objects.group});
         that.setup = function(container){
             group_mock_called = true;
             same(container[0].id,'group','group id');