diff --git a/ipscan-unittest/src/net/azib/ipscan/core/IntegerWithUnitTest.java b/ipscan-unittest/src/net/azib/ipscan/core/IntegerWithUnitTest.java
index 5c21954d..0452504d 100755
--- a/ipscan-unittest/src/net/azib/ipscan/core/IntegerWithUnitTest.java
+++ b/ipscan-unittest/src/net/azib/ipscan/core/IntegerWithUnitTest.java
@@ -7,6 +7,7 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 import net.azib.ipscan.config.Labels;
+import net.azib.ipscan.core.values.IntegerWithUnit;
 
 import org.junit.Test;
 
diff --git a/ipscan-unittest/src/net/azib/ipscan/core/ScannerTest.java b/ipscan-unittest/src/net/azib/ipscan/core/ScannerTest.java
index c48b7a6f..5ae5d272 100755
--- a/ipscan-unittest/src/net/azib/ipscan/core/ScannerTest.java
+++ b/ipscan-unittest/src/net/azib/ipscan/core/ScannerTest.java
@@ -18,6 +18,8 @@ import java.util.HashSet;
 import java.util.Set;
 
 import net.azib.ipscan.config.Config;
+import net.azib.ipscan.core.values.NotAvailableValue;
+import net.azib.ipscan.core.values.NotScannedValue;
 import net.azib.ipscan.fetchers.Fetcher;
 import net.azib.ipscan.fetchers.FetcherRegistry;
 
diff --git a/ipscan-unittest/src/net/azib/ipscan/core/NotAvailableValueTest.java b/ipscan-unittest/src/net/azib/ipscan/core/values/NotAvailableValueTest.java
similarity index 90%
rename from ipscan-unittest/src/net/azib/ipscan/core/NotAvailableValueTest.java
rename to ipscan-unittest/src/net/azib/ipscan/core/values/NotAvailableValueTest.java
index ad17812b..f6564a14 100755
--- a/ipscan-unittest/src/net/azib/ipscan/core/NotAvailableValueTest.java
+++ b/ipscan-unittest/src/net/azib/ipscan/core/values/NotAvailableValueTest.java
@@ -1,10 +1,12 @@
 /**
  * 
  */
-package net.azib.ipscan.core;
+package net.azib.ipscan.core.values;
 
 import static org.junit.Assert.*;
 import net.azib.ipscan.config.Labels;
+import net.azib.ipscan.core.values.NotAvailableValue;
+
 import org.junit.Test;
 
 /**
diff --git a/ipscan-unittest/src/net/azib/ipscan/core/NotScannedValueTest.java b/ipscan-unittest/src/net/azib/ipscan/core/values/NotScannedValueTest.java
similarity index 90%
rename from ipscan-unittest/src/net/azib/ipscan/core/NotScannedValueTest.java
rename to ipscan-unittest/src/net/azib/ipscan/core/values/NotScannedValueTest.java
index 10bea670..29b5458d 100755
--- a/ipscan-unittest/src/net/azib/ipscan/core/NotScannedValueTest.java
+++ b/ipscan-unittest/src/net/azib/ipscan/core/values/NotScannedValueTest.java
@@ -1,10 +1,12 @@
 /**
  * 
  */
-package net.azib.ipscan.core;
+package net.azib.ipscan.core.values;
 
 import static org.junit.Assert.*;
 import net.azib.ipscan.config.Labels;
+import net.azib.ipscan.core.values.NotScannedValue;
+
 import org.junit.Test;
 
 /**
diff --git a/ipscan-unittest/src/net/azib/ipscan/core/values/NumericListValueTest.java b/ipscan-unittest/src/net/azib/ipscan/core/values/NumericListValueTest.java
new file mode 100755
index 00000000..d051e138
--- /dev/null
+++ b/ipscan-unittest/src/net/azib/ipscan/core/values/NumericListValueTest.java
@@ -0,0 +1,30 @@
+/**
+ * 
+ */
+package net.azib.ipscan.core.values;
+
+import static org.junit.Assert.assertEquals;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.TreeSet;
+
+import org.junit.Test;
+
+
+/**
+ * @author Anton Keks
+ */
+public class NumericListValueTest {
+
+	@Test
+	public void testToString() {
+		assertEquals("", new NumericListValue(Collections.EMPTY_LIST, true).toString());
+		assertEquals("1", new NumericListValue(Arrays.asList(new Object[] {1}), true).toString());
+		assertEquals("1-3", new NumericListValue(Arrays.asList(new Object[] {1, 2, 3}), true).toString());
+		assertEquals("1-3", new NumericListValue(new TreeSet<Integer>(Arrays.asList(new Integer[] {2, 3, 1})), true).toString());
+		assertEquals("1,2,3", new NumericListValue(Arrays.asList(new Object[] {1, 2, 3}), false).toString());
+		assertEquals("1,5-6,15", new NumericListValue(Arrays.asList(new Object[] {1, 5, 6, 15}), true).toString());
+		assertEquals("1,85,89,103", new NumericListValue(Arrays.asList(new Object[] {103, 85, 89, 1}), true).toString());
+	}
+}
diff --git a/ipscan-unittest/src/net/azib/ipscan/fetchers/PingFetcherTest.java b/ipscan-unittest/src/net/azib/ipscan/fetchers/PingFetcherTest.java
index 499c55f0..b2ac5525 100755
--- a/ipscan-unittest/src/net/azib/ipscan/fetchers/PingFetcherTest.java
+++ b/ipscan-unittest/src/net/azib/ipscan/fetchers/PingFetcherTest.java
@@ -3,6 +3,8 @@
  */
 package net.azib.ipscan.fetchers;
 
+import net.azib.ipscan.config.Config;
+
 import org.junit.Before;
 
 /**
@@ -14,7 +16,7 @@ public class PingFetcherTest extends AbstractFetcherTestCase {
 
 	@Before
 	public void setUp() throws Exception {
-		fetcher = new PingFetcher(null);
+		fetcher = new PingFetcher(null, Config.getGlobal());
 	}
 
 }
diff --git a/ipscan-unittest/src/net/azib/ipscan/fetchers/PingTTLFetcherTest.java b/ipscan-unittest/src/net/azib/ipscan/fetchers/PingTTLFetcherTest.java
index 42fb4923..0a5e2afb 100755
--- a/ipscan-unittest/src/net/azib/ipscan/fetchers/PingTTLFetcherTest.java
+++ b/ipscan-unittest/src/net/azib/ipscan/fetchers/PingTTLFetcherTest.java
@@ -3,6 +3,8 @@
  */
 package net.azib.ipscan.fetchers;
 
+import net.azib.ipscan.config.Config;
+
 import org.junit.Before;
 
 /**
@@ -14,7 +16,7 @@ public class PingTTLFetcherTest extends AbstractFetcherTestCase {
 
 	@Before
 	public void setUp() throws Exception {
-		fetcher = new PingTTLFetcher(null);
+		fetcher = new PingTTLFetcher(null, Config.getGlobal());
 	}
 
 }
diff --git a/ipscan-unittest/src/net/azib/ipscan/fetchers/PortsFetcherTest.java b/ipscan-unittest/src/net/azib/ipscan/fetchers/PortsFetcherTest.java
index 72feda82..7ed3165b 100755
--- a/ipscan-unittest/src/net/azib/ipscan/fetchers/PortsFetcherTest.java
+++ b/ipscan-unittest/src/net/azib/ipscan/fetchers/PortsFetcherTest.java
@@ -3,28 +3,20 @@
  */
 package net.azib.ipscan.fetchers;
 
-import static org.junit.Assert.assertEquals;
+import net.azib.ipscan.config.Config;
 
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.TreeSet;
-
-import org.junit.Test;
+import org.junit.Before;
 
 /**
  * PortsFetcherTest
  *
  * @author anton
  */
-public class PortsFetcherTest {
+public class PortsFetcherTest extends AbstractFetcherTestCase {
 
-	@Test
-	public void testPortListToRange() {
-		assertEquals("", PortsFetcher.portListToRange(Collections.EMPTY_LIST, true));
-		assertEquals("1", PortsFetcher.portListToRange(Arrays.asList(new Object[] {1}), true));
-		assertEquals("1-3", PortsFetcher.portListToRange(Arrays.asList(new Object[] {1, 2, 3}), true));
-		assertEquals("1-3", PortsFetcher.portListToRange(new TreeSet<Integer>(Arrays.asList(new Integer[] {2, 3, 1})), true));
-		assertEquals("1,2,3", PortsFetcher.portListToRange(Arrays.asList(new Object[] {1, 2, 3}), false));
-		assertEquals("1,5-6,15", PortsFetcher.portListToRange(Arrays.asList(new Object[] {1, 5, 6, 15}), true));
+	@Before
+	public void setUp() throws Exception {
+		fetcher = new PortsFetcher(Config.getGlobal());
 	}
+
 }