diff --git a/tests/NorthslopePL/Metassione/Tests/EmptyKlass.php b/tests/NorthslopePL/Metassione/Tests/EmptyKlass.php
deleted file mode 100644
index 1e439f5..0000000
--- a/tests/NorthslopePL/Metassione/Tests/EmptyKlass.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-namespace NorthslopePL\Metassione\Tests;
-
-class EmptyKlass
-{
-}
diff --git a/tests/NorthslopePL/Metassione/Tests/ArrayedKlass.php b/tests/NorthslopePL/Metassione/Tests/Examples/ArrayedKlass.php
similarity index 57%
rename from tests/NorthslopePL/Metassione/Tests/ArrayedKlass.php
rename to tests/NorthslopePL/Metassione/Tests/Examples/ArrayedKlass.php
index 9c49dc9..ed4ec9c 100644
--- a/tests/NorthslopePL/Metassione/Tests/ArrayedKlass.php
+++ b/tests/NorthslopePL/Metassione/Tests/Examples/ArrayedKlass.php
@@ -1,5 +1,5 @@
 <?php
-namespace NorthslopePL\Metassione\Tests;
+namespace NorthslopePL\Metassione\Tests\Examples;
 
 class ArrayedKlass
 {
@@ -9,34 +9,34 @@ class ArrayedKlass
 	private $numbers;
 
 	/**
-	 * @var array|\NorthslopePL\Metassione\Tests\OnePropertyKlass[]
+	 * @var array|\NorthslopePL\Metassione\Tests\Examples\OnePropertyKlass[]
 	 */
 	private $objects;
 
 	/**
 	 * Inverted order of 'array' and classname
 	 *
-	 * @var \NorthslopePL\Metassione\Tests\OnePropertyKlass[]|array
+	 * @var \NorthslopePL\Metassione\Tests\Examples\OnePropertyKlass[]|array
 	 */
 	private $objects2;
 
 	/**
 	 * Without [] at the end
 	 *
-	 * @var array|\NorthslopePL\Metassione\Tests\OnePropertyKlass
+	 * @var array|\NorthslopePL\Metassione\Tests\Examples\OnePropertyKlass
 	 */
 	private $objects3;
 
 	/**
 	 * Without 'array|'
 	 *
-	 * @var \NorthslopePL\Metassione\Tests\OnePropertyKlass[]
+	 * @var \NorthslopePL\Metassione\Tests\Examples\OnePropertyKlass[]
 	 */
 	private $invalidSpecificationForObjects;
 
 
 	/**
-	 * @param array|\NorthslopePL\Metassione\Tests\OnePropertyKlass[] $objects
+	 * @param array|\NorthslopePL\Metassione\Tests\Examples\OnePropertyKlass[] $objects
 	 */
 	public function setObjects($objects)
 	{
@@ -44,7 +44,7 @@ public function setObjects($objects)
 	}
 
 	/**
-	 * @return array|\NorthslopePL\Metassione\Tests\OnePropertyKlass[]
+	 * @return array|\NorthslopePL\Metassione\Tests\Examples\OnePropertyKlass[]
 	 */
 	public function getObjects()
 	{
@@ -68,7 +68,7 @@ public function getNumbers()
 	}
 
 	/**
-	 * @param array|\NorthslopePL\Metassione\Tests\OnePropertyKlass[] $objects2
+	 * @param array|\NorthslopePL\Metassione\Tests\Examples\OnePropertyKlass[] $objects2
 	 */
 	public function setObjects2($objects2)
 	{
@@ -76,7 +76,7 @@ public function setObjects2($objects2)
 	}
 
 	/**
-	 * @return array|\NorthslopePL\Metassione\Tests\OnePropertyKlass[]
+	 * @return array|\NorthslopePL\Metassione\Tests\Examples\OnePropertyKlass[]
 	 */
 	public function getObjects2()
 	{
@@ -84,7 +84,7 @@ public function getObjects2()
 	}
 
 	/**
-	 * @param array|\NorthslopePL\Metassione\Tests\OnePropertyKlass $objects3
+	 * @param array|\NorthslopePL\Metassione\Tests\Examples\OnePropertyKlass $objects3
 	 */
 	public function setObjects3($objects3)
 	{
@@ -92,7 +92,7 @@ public function setObjects3($objects3)
 	}
 
 	/**
-	 * @return array|\NorthslopePL\Metassione\Tests\OnePropertyKlass
+	 * @return array|\NorthslopePL\Metassione\Tests\Examples\OnePropertyKlass
 	 */
 	public function getObjects3()
 	{
@@ -100,7 +100,7 @@ public function getObjects3()
 	}
 
 	/**
-	 * @param \NorthslopePL\Metassione\Tests\OnePropertyKlass[] $invalidSpecificationForObjects
+	 * @param \NorthslopePL\Metassione\Tests\Examples\OnePropertyKlass[] $invalidSpecificationForObjects
 	 */
 	public function setInvalidSpecificationForObjects($invalidSpecificationForObjects)
 	{
@@ -108,7 +108,7 @@ public function setInvalidSpecificationForObjects($invalidSpecificationForObject
 	}
 
 	/**
-	 * @return \NorthslopePL\Metassione\Tests\OnePropertyKlass[]
+	 * @return \NorthslopePL\Metassione\Tests\Examples\OnePropertyKlass[]
 	 */
 	public function getInvalidSpecificationForObjects()
 	{
diff --git a/tests/NorthslopePL/Metassione/Tests/Examples/EmptyKlass.php b/tests/NorthslopePL/Metassione/Tests/Examples/EmptyKlass.php
new file mode 100644
index 0000000..e0f255d
--- /dev/null
+++ b/tests/NorthslopePL/Metassione/Tests/Examples/EmptyKlass.php
@@ -0,0 +1,6 @@
+<?php
+namespace NorthslopePL\Metassione\Tests\Examples;
+
+class EmptyKlass
+{
+}
diff --git a/tests/NorthslopePL/Metassione/Tests/Examples/OneObjectPropertyKlass.php b/tests/NorthslopePL/Metassione/Tests/Examples/OneObjectPropertyKlass.php
new file mode 100644
index 0000000..f5cccb4
--- /dev/null
+++ b/tests/NorthslopePL/Metassione/Tests/Examples/OneObjectPropertyKlass.php
@@ -0,0 +1,27 @@
+<?php
+namespace NorthslopePL\Metassione\Tests\Examples;
+
+class OneObjectPropertyKlass
+{
+	/**
+	 * @var \NorthslopePL\Metassione\Tests\Examples\OnePropertyKlass
+	 */
+	private $value;
+
+	/**
+	 * @param \NorthslopePL\Metassione\Tests\Examples\OnePropertyKlass $value
+	 */
+	public function setValue(OnePropertyKlass $value)
+	{
+		$this->value = $value;
+	}
+
+	/**
+	 * @return \NorthslopePL\Metassione\Tests\Examples\OnePropertyKlass
+	 */
+	public function getValue()
+	{
+		return $this->value;
+	}
+
+}
diff --git a/tests/NorthslopePL/Metassione/Tests/OnePropertyKlass.php b/tests/NorthslopePL/Metassione/Tests/Examples/OnePropertyKlass.php
similarity index 83%
rename from tests/NorthslopePL/Metassione/Tests/OnePropertyKlass.php
rename to tests/NorthslopePL/Metassione/Tests/Examples/OnePropertyKlass.php
index 81bfbdd..ca46181 100644
--- a/tests/NorthslopePL/Metassione/Tests/OnePropertyKlass.php
+++ b/tests/NorthslopePL/Metassione/Tests/Examples/OnePropertyKlass.php
@@ -1,5 +1,5 @@
 <?php
-namespace NorthslopePL\Metassione\Tests;
+namespace NorthslopePL\Metassione\Tests\Examples;
 
 class OnePropertyKlass
 {
diff --git a/tests/NorthslopePL/Metassione/Tests/PropertyNotFoundKlass.php b/tests/NorthslopePL/Metassione/Tests/Examples/PropertyNotFoundKlass.php
similarity index 57%
rename from tests/NorthslopePL/Metassione/Tests/PropertyNotFoundKlass.php
rename to tests/NorthslopePL/Metassione/Tests/Examples/PropertyNotFoundKlass.php
index 36b89f6..cdb4918 100644
--- a/tests/NorthslopePL/Metassione/Tests/PropertyNotFoundKlass.php
+++ b/tests/NorthslopePL/Metassione/Tests/Examples/PropertyNotFoundKlass.php
@@ -1,12 +1,12 @@
 <?php
-namespace NorthslopePL\Metassione\Tests;
+namespace NorthslopePL\Metassione\Tests\Examples;
 
 class PropertyNotFoundKlass
 {
 	/**
 	 * Class Foo just does not exist. This is expected behaviour for that test.
 	 *
-	 * @var \NorthslopePL\Metassione\Tests\Foo
+	 * @var \NorthslopePL\Metassione\Tests\Examples\Foo
 	 */
 	private $foo;
 
@@ -19,7 +19,7 @@ class PropertyNotFoundKlass
 	private $one;
 
 	/**
-	 * @param \NorthslopePL\Metassione\Tests\Foo $foo
+	 * @param \NorthslopePL\Metassione\Tests\Examples\Foo $foo
 	 */
 	public function setFoo($foo)
 	{
@@ -27,7 +27,7 @@ public function setFoo($foo)
 	}
 
 	/**
-	 * @return \NorthslopePL\Metassione\Tests\Foo
+	 * @return \NorthslopePL\Metassione\Tests\Examples\Foo
 	 */
 	public function getFoo()
 	{
@@ -35,7 +35,7 @@ public function getFoo()
 	}
 
 	/**
-	 * @param \NorthslopePL\Metassione\Tests\OnePropertyKlass $one
+	 * @param \NorthslopePL\Metassione\Tests\Examples\OnePropertyKlass $one
 	 */
 	public function setOne($one)
 	{
@@ -43,7 +43,7 @@ public function setOne($one)
 	}
 
 	/**
-	 * @return \NorthslopePL\Metassione\Tests\OnePropertyKlass
+	 * @return \NorthslopePL\Metassione\Tests\Examples\OnePropertyKlass
 	 */
 	public function getOne()
 	{
diff --git a/tests/NorthslopePL/Metassione/Tests/SimpleKlass.php b/tests/NorthslopePL/Metassione/Tests/Examples/SimpleKlass.php
similarity index 96%
rename from tests/NorthslopePL/Metassione/Tests/SimpleKlass.php
rename to tests/NorthslopePL/Metassione/Tests/Examples/SimpleKlass.php
index 6cf223d..848ac7a 100644
--- a/tests/NorthslopePL/Metassione/Tests/SimpleKlass.php
+++ b/tests/NorthslopePL/Metassione/Tests/Examples/SimpleKlass.php
@@ -1,5 +1,5 @@
 <?php
-namespace NorthslopePL\Metassione\Tests;
+namespace NorthslopePL\Metassione\Tests\Examples;
 
 class SimpleKlass
 {
diff --git a/tests/NorthslopePL/Metassione/Tests/OneObjectPropertyKlass.php b/tests/NorthslopePL/Metassione/Tests/OneObjectPropertyKlass.php
deleted file mode 100644
index 8f7dce7..0000000
--- a/tests/NorthslopePL/Metassione/Tests/OneObjectPropertyKlass.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-namespace NorthslopePL\Metassione\Tests;
-
-class OneObjectPropertyKlass
-{
-	/**
-	 * @var \NorthslopePL\Metassione\Tests\OnePropertyKlass
-	 */
-	private $value;
-
-	/**
-	 * @param \NorthslopePL\Metassione\Tests\OnePropertyKlass $value
-	 */
-	public function setValue(\NorthslopePL\Metassione\Tests\OnePropertyKlass $value)
-	{
-		$this->value = $value;
-	}
-
-	/**
-	 * @return \NorthslopePL\Metassione\Tests\OnePropertyKlass
-	 */
-	public function getValue()
-	{
-		return $this->value;
-	}
-
-}
diff --git a/tests/NorthslopePL/Metassione/Tests/POPOConverterTest.php b/tests/NorthslopePL/Metassione/Tests/POPOConverterTest.php
index 434ef28..65225d3 100644
--- a/tests/NorthslopePL/Metassione/Tests/POPOConverterTest.php
+++ b/tests/NorthslopePL/Metassione/Tests/POPOConverterTest.php
@@ -2,6 +2,10 @@
 namespace NorthslopePL\Metassione\Tests;
 
 use NorthslopePL\Metassione\POPOConverter;
+use NorthslopePL\Metassione\Tests\Examples\ArrayedKlass;
+use NorthslopePL\Metassione\Tests\Examples\EmptyKlass;
+use NorthslopePL\Metassione\Tests\Examples\OnePropertyKlass;
+use NorthslopePL\Metassione\Tests\Examples\SimpleKlass;
 
 class POPOConverterTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/tests/NorthslopePL/Metassione/Tests/POPOObjectFillerTest.php b/tests/NorthslopePL/Metassione/Tests/POPOObjectFillerTest.php
index 3ca4f21..7ff968e 100644
--- a/tests/NorthslopePL/Metassione/Tests/POPOObjectFillerTest.php
+++ b/tests/NorthslopePL/Metassione/Tests/POPOObjectFillerTest.php
@@ -3,6 +3,12 @@
 
 use NorthslopePL\Metassione\POPOObjectFiller;
 use NorthslopePL\Metassione\Tests\Blog\Blog;
+use NorthslopePL\Metassione\Tests\Examples\ArrayedKlass;
+use NorthslopePL\Metassione\Tests\Examples\EmptyKlass;
+use NorthslopePL\Metassione\Tests\Examples\OneObjectPropertyKlass;
+use NorthslopePL\Metassione\Tests\Examples\OnePropertyKlass;
+use NorthslopePL\Metassione\Tests\Examples\PropertyNotFoundKlass;
+use NorthslopePL\Metassione\Tests\Examples\SimpleKlass;
 
 class POPOObjectFillerTest extends \PHPUnit_Framework_TestCase
 {
@@ -91,7 +97,7 @@ public function testFillingSimpleObjectWithRawDataThatIsNotAnObject()
 		$simpleObject = new SimpleKlass();
 		$rawData = 'foobar';
 
-		$this->setExpectedException('NorthslopePL\Metassione\ObjectFillingException', 'Raw data should be an object, but string was given. I was trying to fill object of class NorthslopePL\Metassione\Tests\SimpleKlass.');
+		$this->setExpectedException('NorthslopePL\Metassione\ObjectFillingException', 'Raw data should be an object, but string was given. I was trying to fill object of class NorthslopePL\Metassione\Tests\Examples\SimpleKlass.');
 
 		$this->objectFiller->fillObjectWithRawData($simpleObject, $rawData);
 	}
@@ -102,7 +108,7 @@ public function testFillingObjectWhenItsPropertysClassDoesNotExist()
 		$rawData = new \stdClass();
 		$rawData->foo = 'bar';
 
-		$this->setExpectedException('NorthslopePL\Metassione\ObjectFillingException', 'Class "NorthslopePL\Metassione\Tests\Foo" does not exist for property NorthslopePL\Metassione\Tests\PropertyNotFoundKlass::$foo');
+		$this->setExpectedException('NorthslopePL\Metassione\ObjectFillingException', 'Class "NorthslopePL\Metassione\Tests\Examples\Foo" does not exist for property NorthslopePL\Metassione\Tests\Examples\PropertyNotFoundKlass::$foo');
 		$this->objectFiller->fillObjectWithRawData($targetObject, $rawData);
 	}
 
@@ -167,7 +173,7 @@ public function testFillingObjectWithIncorrectlyDocumentedArrayProperty()
 		}
 		$rawData->invalidSpecificationForObjects = array($object1, $object2);
 
-		$this->setExpectedException('NorthslopePL\Metassione\ObjectFillingException', 'Raw data should be an object, but array was given. I was trying to fill object of class NorthslopePL\Metassione\Tests\OnePropertyKlass. Maybe you have forgotten about adding "array|" for property that holds this class NorthslopePL\Metassione\Tests\OnePropertyKlass');
+		$this->setExpectedException('NorthslopePL\Metassione\ObjectFillingException', 'Raw data should be an object, but array was given. I was trying to fill object of class NorthslopePL\Metassione\Tests\Examples\OnePropertyKlass. Maybe you have forgotten about adding "array|" for property that holds this class NorthslopePL\Metassione\Tests\Examples\OnePropertyKlass');
 		$this->objectFiller->fillObjectWithRawData($targetObject, $rawData);
 	}
 
@@ -188,7 +194,7 @@ public function testUsingUnqalifiedClassname()
 		$sourceData = new \stdClass();
 		$sourceData->one = (object)array('value' => 42);
 
-		$this->setExpectedException('NorthslopePL\Metassione\ObjectFillingException', 'Class "OnePropertyKlass" does not exist for property NorthslopePL\Metassione\Tests\PropertyNotFoundKlass::$one. Maybe you have forgotten to use fully qualified class name (with namespace, example: \Foo\Bar\OnePropertyKlass)?');
+		$this->setExpectedException('NorthslopePL\Metassione\ObjectFillingException', 'Class "OnePropertyKlass" does not exist for property NorthslopePL\Metassione\Tests\Examples\PropertyNotFoundKlass::$one. Maybe you have forgotten to use fully qualified class name (with namespace, example: \Foo\Bar\OnePropertyKlass)?');
 		$this->objectFiller->fillObjectWithRawData($targetObject, $sourceData);
 	}
 }