diff --git a/test/functional/application_controller_test.rb b/test/functional/application_controller_test.rb
index e3bb0af..19925e7 100644
--- a/test/functional/application_controller_test.rb
+++ b/test/functional/application_controller_test.rb
@@ -6,7 +6,7 @@ class TestController; def rescue_action(e) raise e end; end
 
 class ApplicationControllerTest < Test::Unit::TestCase
 
-  fixtures :profiles, :virtual_communities, :domains, :boxes
+  fixtures :profiles, :virtual_communities, :domains, :design_boxes
 
   def setup
     @controller = TestController.new
diff --git a/test/integration/login_to_the_application_test.rb b/test/integration/login_to_the_application_test.rb
index e003645..33b8301 100644
--- a/test/integration/login_to_the_application_test.rb
+++ b/test/integration/login_to_the_application_test.rb
@@ -5,27 +5,27 @@ class LoginToTheApplicationTest < ActionController::IntegrationTest
 
   def test_anonymous_user_logins_to_application
     get '/'
-    assert_tag :tag => 'div', :attributes => { :id => 'login_box' }
-    assert_no_tag :tag => 'div', :attributes => { :id => 'user_links'  }
-    assert_no_tag :tag => 'div', :attributes => { :id => 'logout_box'  }
+    assert_tag :tag => 'span', :attributes => { :id => 'login_box' }
+    assert_no_tag :tag => 'span', :attributes => { :id => 'user_links'  }
+    assert_no_tag :tag => 'span', :attributes => { :id => 'logout_box'  }
 
     get '/account/login'
     assert_response :success
 
     login('ze', 'test')
 
-    assert_no_tag :tag => 'div', :attributes => { :id => 'login_box' }
-    assert_tag :tag => 'div', :attributes => { :id => 'user_links'  }
-    assert_tag :tag => 'div', :attributes => { :id => 'logout_box'  }
+    assert_no_tag :tag => 'span', :attributes => { :id => 'login_box' }
+    assert_tag :tag => 'span', :attributes => { :id => 'user_links'  }
+    assert_tag :tag => 'span', :attributes => { :id => 'logout_box'  }
   end
 
   def test_logged_in_does_not_see_login_box
     login('ze', 'test')
     get '/'
-    assert_no_tag :tag => 'div', :attributes => { :id => 'login_box' }
-    assert_no_tag :tag => 'div', :attributes => { :id => 'register_box' }
-    assert_tag :tag => 'div', :attributes => { :id => 'user_links'  }
-    assert_tag :tag => 'div', :attributes => { :id => 'logout_box'  }
+    assert_no_tag :tag => 'span', :attributes => { :id => 'login_box' }
+    assert_no_tag :tag => 'span', :attributes => { :id => 'register_box' }
+    assert_tag :tag => 'span', :attributes => { :id => 'user_links'  }
+    assert_tag :tag => 'span', :attributes => { :id => 'logout_box'  }
   end
 
 end
diff --git a/test/integration/user_registers_at_the_application_test.rb b/test/integration/user_registers_at_the_application_test.rb
index 7d9fdb7..664a6f9 100644
--- a/test/integration/user_registers_at_the_application_test.rb
+++ b/test/integration/user_registers_at_the_application_test.rb
@@ -6,7 +6,7 @@ class UserRegistersAtTheApplicationTest < ActionController::IntegrationTest
   # Replace this with your real tests.
   def test_successfull_registration
     get '/'
-    assert_tag :tag => 'div', :attributes => { :id => 'register_box' }
+    assert_tag :tag => 'span', :attributes => { :id => 'register_box' }
 
     get '/account/signup'
     assert_response :success
@@ -17,9 +17,9 @@ class UserRegistersAtTheApplicationTest < ActionController::IntegrationTest
 
     # user is logged in right after the registration
     follow_redirect!
-    assert_no_tag :tag => 'div', :attributes => { :id => 'login_box' }
-    assert_tag :tag => 'div', :attributes => { :id => 'user_links'  }
-    assert_tag :tag => 'div', :attributes => { :id => 'logout_box'  }
+    assert_no_tag :tag => 'span', :attributes => { :id => 'login_box' }
+    assert_tag :tag => 'span', :attributes => { :id => 'user_links'  }
+    assert_tag :tag => 'span', :attributes => { :id => 'logout_box'  }
   end
 
   def test_trying_an_existing_login_name
@@ -27,7 +27,7 @@ class UserRegistersAtTheApplicationTest < ActionController::IntegrationTest
     assert User.find_by_login('ze') # just to make sure that 'ze' already exists
 
     get '/'
-    assert_tag :tag => 'div', :attributes => { :id => 'register_box' }
+    assert_tag :tag => 'span', :attributes => { :id => 'register_box' }
 
     get '/account/signup'
     assert_response :success
--
libgit2 0.21.2