diff --git a/test/net/azib/ipscan/fetchers/FetcherRegistryTest.java b/test/net/azib/ipscan/fetchers/FetcherRegistryTest.java
index 853a9513..c99f96f3 100644
--- a/test/net/azib/ipscan/fetchers/FetcherRegistryTest.java
+++ b/test/net/azib/ipscan/fetchers/FetcherRegistryTest.java
@@ -7,8 +7,6 @@ import net.azib.ipscan.core.ScanningSubject;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
-import org.picocontainer.MutablePicoContainer;
-import org.picocontainer.defaults.DefaultPicoContainer;
 
 import java.util.Iterator;
 import java.util.prefs.Preferences;
@@ -94,14 +92,14 @@ public class FetcherRegistryTest {
 		fetcherRegistry.updateSelectedFetchers(new String[] {ipFetcher.getId()});
 		assertEquals(1, fetcherRegistry.getSelectedFetchers().size());
 		Iterator<?> iterator = fetcherRegistry.getSelectedFetchers().iterator();
-		assertEquals(ipFetcher.getId(), ((Fetcher)iterator.next()).getId());
+		assertEquals(ipFetcher.getId(), ((Fetcher) iterator.next()).getId());
 		assertEquals(ipFetcher.getId(), preferences.get(FetcherRegistry.PREFERENCE_SELECTED_FETCHERS, null));
 		
 		// now return a fetcher back
-		fetcherRegistry.updateSelectedFetchers(new String[] {commentFetcher.getId(), ipFetcher.getId()});
+		fetcherRegistry.updateSelectedFetchers(new String[]{commentFetcher.getId(), ipFetcher.getId()});
 		assertEquals(2, fetcherRegistry.getSelectedFetchers().size());
 		iterator = fetcherRegistry.getSelectedFetchers().iterator();
-		assertEquals(commentFetcher.getId(), ((Fetcher)iterator.next()).getId());
+		assertEquals(commentFetcher.getId(), ((Fetcher) iterator.next()).getId());
 		assertEquals(ipFetcher.getId(), ((Fetcher)iterator.next()).getId());
 		assertEquals(commentFetcher.getId() + "###" + ipFetcher.getId(), preferences.get(FetcherRegistry.PREFERENCE_SELECTED_FETCHERS, null));
 	}
@@ -116,32 +114,29 @@ public class FetcherRegistryTest {
 				listenerWasCalled[0] = true;
 			}
 		});
-		fetcherRegistry.updateSelectedFetchers(new String[] {});
+		fetcherRegistry.updateSelectedFetchers(new String[]{});
 		assertTrue(listenerWasCalled[0]);
 	}
+
+	@Test(expected = FetcherException.class)
+	public void openUneditableFetcher() {
+		fetcherRegistry.openPreferencesEditor(ipFetcher);
+	}
+
+	private final static String MESSAGE = "foo bar";
 	
 	@Test
-	public void testOpenPreferencesEditor() throws Exception {
-		String message = "foo bar";
-		MutablePicoContainer container = new DefaultPicoContainer();
-		container.registerComponentInstance(message);
-		
+	public void openPreferencesEditor() {
 		Fetcher editableFetcher = new EditableFetcher();
 		fetcherRegistry = new FetcherRegistry(asList(ipFetcher, editableFetcher), preferences);
-		
 		EditableFetcherPrefs.calledWithMessage = null;
-		fetcherRegistry.openPreferencesEditor(editableFetcher);		
-		assertSame(message, EditableFetcherPrefs.calledWithMessage);
-		assertSame(editableFetcher, EditableFetcherPrefs.calledForFetcher);
 
-		try {
-			fetcherRegistry.openPreferencesEditor(ipFetcher);
-			fail("This fetcher is not editable");
-		}
-		catch (FetcherException e) {
-		}
+		fetcherRegistry.openPreferencesEditor(editableFetcher);
+
+		assertSame(MESSAGE, EditableFetcherPrefs.calledWithMessage);
+		assertSame(editableFetcher, EditableFetcherPrefs.calledForFetcher);
 	}
-	
+
 	public static class EditableFetcher extends AbstractFetcher {
 		@Override public String getId() {
 			return null;
@@ -157,15 +152,9 @@ public class FetcherRegistryTest {
 	public static class EditableFetcherPrefs implements FetcherPrefs {
 		private static String calledWithMessage;
 		private static Fetcher calledForFetcher;
-		
-		private String message;
-
-		public EditableFetcherPrefs(String message) {
-			this.message = message;
-		}
 
 		public void openFor(Fetcher fetcher) {
-			calledWithMessage = message;
+			calledWithMessage = MESSAGE;
 			calledForFetcher = fetcher;
 		}		
 	}