Index: lutinutil/src/test/org/codelutin/i18n/I18nLoaderTest.java
diff -u lutinutil/src/test/org/codelutin/i18n/I18nLoaderTest.java:1.1 lutinutil/src/test/org/codelutin/i18n/I18nLoaderTest.java:1.2
--- lutinutil/src/test/org/codelutin/i18n/I18nLoaderTest.java:1.1	Sun Mar 23 06:02:24 2008
+++ lutinutil/src/test/org/codelutin/i18n/I18nLoaderTest.java	Sun Mar 23 21:08:16 2008
@@ -4,6 +4,8 @@
 
 import java.util.Locale;
 
+import org.codelutin.i18n.bundle.I18nBundleManager;
+
 /**
  * LanguageManager Tester.
  *
@@ -17,14 +19,17 @@
     Locale locale;
     Language language;
     I18nLoader loader;
+    I18nBundleManager bundleManager;
 
     public I18nLoaderTest(String name) {
         super(name);
+
     }
 
     @Override
     protected void setUp() throws Exception {
         super.setUp();
+
     }
 
     @Override
@@ -38,33 +43,33 @@
         assertNull(I18n.loader);
 
         loader = I18n.getLoader(I18n.DEFAULT_ENCODING);
-
+        bundleManager = I18n.getBundleManager();
         assertNotNull(loader);
-        assertEquals(I18n.DEFAULT_ENCODING, loader.getEncoding());
-        assertEquals(I18n.DEFAULT_LOCALE, loader.getDefaultLocale());
+        assertEquals(I18n.DEFAULT_ENCODING, loader.getEncoding());        
+        assertEquals(bundleManager.getDefaultLocale(), I18n.newLocale(null));
         assertNull(loader.getLanguage());
     }
 
     public void testChangeLocale() throws Exception {
 
-        locale = I18nLoader.newLocale("fr_FR");
+        locale = I18n.newLocale("fr_FR");
         encoding = I18n.ISO_8859_1_ENCONDING;
         updateLanguage();
         assertNbLanguages(1);
         updateLanguage();
         assertNbLanguages(1);
         
-        locale = I18nLoader.newLocale("en_GB");
+        locale = I18n.newLocale("en_GB");
         updateLanguage();
         assertLanguageChanged();        
         assertNbLanguages(2);
 
-        locale = I18nLoader.newLocale("en_US");
+        locale = I18n.newLocale("en_US");
         updateLanguage();
         assertLanguageChanged();
         assertNbLanguages(3);
 
-        locale = I18nLoader.newLocale("en");
+        locale = I18n.newLocale("en");
         updateLanguage();
         assertLanguageChanged();
         assertNbLanguages(4);
@@ -75,11 +80,11 @@
     }
 
     public void testChangeEncoding() throws Exception {
-        locale = I18nLoader.newLocale("fr_FR");
+        locale = I18n.newLocale("fr_FR");
         encoding = I18n.ISO_8859_1_ENCONDING;
         updateLanguage();
 
-        locale = I18nLoader.newLocale("en_GB");
+        locale = I18n.newLocale("en_GB");
         updateLanguage();
 
         // language change (from his encoding)
@@ -103,7 +108,8 @@
     protected void updateLanguage() {
         language = loader == null ? null : loader.getLanguage();
         loader = I18n.getLoader(encoding);
-        loader.setLanguage(locale);
+        bundleManager = I18n.getBundleManager();
+        loader.setLanguage(locale, bundleManager);
     }
 
 }
\ No newline at end of file