diff --git a/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/bootstrap/AbstractBootstrap.java b/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/bootstrap/AbstractBootstrap.java
index 72ab777..8dab1c1 100644
--- a/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/bootstrap/AbstractBootstrap.java
+++ b/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/bootstrap/AbstractBootstrap.java
@@ -49,7 +49,7 @@ import br.gov.frameworkdemoiselle.internal.producer.LoggerProducer;
 import br.gov.frameworkdemoiselle.internal.producer.ResourceBundleProducer;
 import br.gov.frameworkdemoiselle.util.ResourceBundle;
 
-public class AbstractBootstrap implements Extension {
+public abstract class AbstractBootstrap implements Extension {
 
 	private static ResourceBundleProducer bundleFactory = new ResourceBundleProducer();
 
diff --git a/impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/bootstrap/AbstractBootstrapTest.java b/impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/bootstrap/AbstractBootstrapTest.java
index fb04440..57ee744 100644
--- a/impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/bootstrap/AbstractBootstrapTest.java
+++ b/impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/bootstrap/AbstractBootstrapTest.java
@@ -41,11 +41,12 @@ import static org.powermock.api.easymock.PowerMock.mockStatic;
 import static org.powermock.api.easymock.PowerMock.replayAll;
 import static org.powermock.api.easymock.PowerMock.verifyAll;
 
+import java.util.Locale;
+
 import javax.enterprise.inject.spi.AfterBeanDiscovery;
 import javax.inject.Scope;
 
 import org.easymock.EasyMock;
-import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.powermock.api.easymock.PowerMock;
@@ -63,30 +64,24 @@ import br.gov.frameworkdemoiselle.util.ResourceBundle;
 @RunWith(PowerMockRunner.class)
 @PrepareForTest({ LoggerProducer.class, Contexts.class })
 public class AbstractBootstrapTest {
-
-	private AbstractBootstrap bootstrap;
-
-	@Before
-	public void setUp() {
-		bootstrap = new AbstractBootstrap();
-	}
-
-	@SuppressWarnings("unchecked")
+	
 	@Test
+	@SuppressWarnings("unchecked")
 	public void testAddContext() {
 		mockStatic(LoggerProducer.class);
 		mockStatic(Contexts.class);
 
 		Logger logger = PowerMock.createMock(Logger.class);
 		logger.trace(EasyMock.anyObject(String.class));
-		
+
 		expect(LoggerProducer.create(EasyMock.anyObject(Class.class))).andReturn(logger);
 
 		ResourceBundle bundle = PowerMock.createMock(ResourceBundle.class);
 		expect(bundle.getString(EasyMock.anyObject(String.class), EasyMock.anyObject(String.class))).andReturn(null);
 
 		ResourceBundleProducer bundleFactory = PowerMock.createMock(ResourceBundleProducer.class);
-		expect(bundleFactory.create(EasyMock.anyObject(String.class))).andReturn(bundle);
+		expect(bundleFactory.create(EasyMock.anyObject(String.class), EasyMock.anyObject(Locale.class))).andReturn(
+				bundle);
 
 		Whitebox.setInternalState(AbstractBootstrap.class, "bundleFactory", bundleFactory);
 
@@ -94,16 +89,14 @@ public class AbstractBootstrapTest {
 		Contexts.add(EasyMock.anyObject(ThreadLocalContext.class), EasyMock.anyObject(AfterBeanDiscovery.class));
 		replayAll(bundle, bundleFactory, logger, LoggerProducer.class, Contexts.class);
 
-		bootstrap.addContext(context,null);
+		AbstractBootstrap.addContext(context, null);
 
 		verifyAll();
 	}
 
-	@SuppressWarnings("unchecked")
 	@Test
+	@SuppressWarnings("unchecked")
 	public void testDisableContext() {
-		AbstractBootstrap bootstrap = new AbstractBootstrap();
-
 		mockStatic(LoggerProducer.class);
 		mockStatic(Contexts.class);
 
@@ -115,7 +108,8 @@ public class AbstractBootstrapTest {
 		expect(bundle.getString(EasyMock.anyObject(String.class), EasyMock.anyObject(String.class))).andReturn(null);
 
 		ResourceBundleProducer bundleFactory = PowerMock.createMock(ResourceBundleProducer.class);
-		expect(bundleFactory.create(EasyMock.anyObject(String.class))).andReturn(bundle);
+		expect(bundleFactory.create(EasyMock.anyObject(String.class), EasyMock.anyObject(Locale.class))).andReturn(
+				bundle);
 
 		Whitebox.setInternalState(AbstractBootstrap.class, "bundleFactory", bundleFactory);
 
@@ -124,7 +118,7 @@ public class AbstractBootstrapTest {
 		Contexts.remove(context);
 		replayAll(bundle, bundleFactory, logger, LoggerProducer.class, Contexts.class);
 
-		bootstrap.disableContext(context);
+		AbstractBootstrap.disableContext(context);
 
 		verifyAll();
 	}
diff --git a/impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/bootstrap/ShutdownBootstrapTest.java b/impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/bootstrap/ShutdownBootstrapTest.java
index 7e88a4e..b3cd74f 100644
--- a/impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/bootstrap/ShutdownBootstrapTest.java
+++ b/impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/bootstrap/ShutdownBootstrapTest.java
@@ -48,6 +48,7 @@ import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Locale;
 import java.util.Set;
 
 import javax.enterprise.inject.spi.AfterBeanDiscovery;
@@ -151,7 +152,8 @@ public class ShutdownBootstrapTest {
 		ResourceBundle bundle = PowerMock.createMock(ResourceBundle.class);
 
 		expect(LoggerProducer.create(EasyMock.anyObject(Class.class))).andReturn(logger).anyTimes();
-		expect(bundleFactory.create(EasyMock.anyObject(String.class))).andReturn(bundle).anyTimes();
+		expect(bundleFactory.create(EasyMock.anyObject(String.class), EasyMock.anyObject(Locale.class))).andReturn(
+				bundle).anyTimes();
 		expect(bundle.getString(EasyMock.anyObject(String.class), EasyMock.anyObject(String.class))).andReturn("")
 				.anyTimes();
 
@@ -175,7 +177,7 @@ public class ShutdownBootstrapTest {
 		EasyMock.expectLastCall().anyTimes();
 
 		PowerMock.replayAll();
-		bootstrap.shuttingDown(null);
+		ShutdownBootstrap.shuttingDown(null);
 
 		assertTrue(list.isEmpty());
 		PowerMock.verifyAll();
diff --git a/impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/bootstrap/StartupBootstrapTest.java b/impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/bootstrap/StartupBootstrapTest.java
index 48267a3..9b459fa 100644
--- a/impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/bootstrap/StartupBootstrapTest.java
+++ b/impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/bootstrap/StartupBootstrapTest.java
@@ -48,6 +48,7 @@ import static org.junit.Assert.fail;
 import java.lang.reflect.Field;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Locale;
 import java.util.Set;
 
 import javax.enterprise.context.ConversationScoped;
@@ -160,7 +161,8 @@ public class StartupBootstrapTest {
 		assertTrue(tempContexts.isEmpty());
 
 		expect(LoggerProducer.create(EasyMock.anyObject(Class.class))).andReturn(logger).anyTimes();
-		expect(bundleFactory.create(EasyMock.anyObject(String.class))).andReturn(bundle).anyTimes();
+		expect(bundleFactory.create(EasyMock.anyObject(String.class), EasyMock.anyObject(Locale.class))).andReturn(
+				bundle).anyTimes();
 		expect(bundle.getString(EasyMock.anyObject(String.class), EasyMock.anyObject(String.class))).andReturn("")
 				.anyTimes();
 
@@ -199,7 +201,8 @@ public class StartupBootstrapTest {
 		ResourceBundle bundle = PowerMock.createMock(ResourceBundle.class);
 
 		expect(LoggerProducer.create(EasyMock.anyObject(Class.class))).andReturn(logger).anyTimes();
-		expect(bundleFactory.create(EasyMock.anyObject(String.class))).andReturn(bundle).anyTimes();
+		expect(bundleFactory.create(EasyMock.anyObject(String.class), EasyMock.anyObject(Locale.class))).andReturn(
+				bundle).anyTimes();
 		expect(bundle.getString(EasyMock.anyObject(String.class), EasyMock.anyObject(String.class))).andReturn("")
 				.anyTimes();
 
@@ -236,9 +239,7 @@ public class StartupBootstrapTest {
 		} catch (Throwable e) {
 			fail();
 		}
-
 	}
-
 }
 
 @SuppressWarnings("rawtypes")
diff --git a/impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/producer/ResourceBundleProducerTest.java b/impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/producer/ResourceBundleProducerTest.java
index eb1b8d4..36299b6 100644
--- a/impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/producer/ResourceBundleProducerTest.java
+++ b/impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/producer/ResourceBundleProducerTest.java
@@ -55,7 +55,6 @@ import org.junit.Test;
 
 import br.gov.frameworkdemoiselle.DemoiselleException;
 import br.gov.frameworkdemoiselle.annotation.Name;
-import br.gov.frameworkdemoiselle.util.ResourceBundle;
 
 public class ResourceBundleProducerTest {
 
@@ -82,28 +81,10 @@ public class ResourceBundleProducerTest {
 	}
 
 	@Test
-	public void testResourceBundleFactoryLocale() {
-		ResourceBundleProducer factory = new ResourceBundleProducer(Locale.getDefault());
-		Assert.assertNotNull(factory);
-	}
-
-	@Test
-	public void testCreateString() {
-		ResourceBundleProducer factory = new ResourceBundleProducer(Locale.getDefault());
-		Assert.assertNotNull(factory.create("demoiselle-core-bundle"));
-	}
-
-	@Test
-	public void testCreateStringWithoutLocale() {
-		ResourceBundleProducer factory = new ResourceBundleProducer();
-		Assert.assertNotNull(factory.create("demoiselle-core-bundle"));
-	}
-
-	@Test
 	public void testCreateWithNonExistentFile() {
-		ResourceBundleProducer factory = new ResourceBundleProducer(Locale.getDefault());
+		ResourceBundleProducer factory = new ResourceBundleProducer();
 		try {
-			factory.create("arquivo_inexistente");
+			factory.create("arquivo_inexistente", Locale.getDefault());
 		} catch (Exception e) {
 			assertTrue(e instanceof DemoiselleException);
 		}
@@ -147,13 +128,4 @@ public class ResourceBundleProducerTest {
 		ResourceBundleProducer factory = new ResourceBundleProducer();
 		Assert.assertNotNull(factory.create(ip, Locale.getDefault()));
 	}
-
-	@Test
-	public void testCreateTwice() {
-		ResourceBundleProducer factory = new ResourceBundleProducer(Locale.getDefault());
-		ResourceBundle bundle = factory.create("demoiselle-core-bundle");
-
-		Assert.assertNotNull(bundle);
-		Assert.assertEquals(bundle, factory.create("demoiselle-core-bundle"));
-	}
 }
--
libgit2 0.21.2