diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index 21d57da..0000000
--- a/.gitmodules
+++ /dev/null
@@ -1,3 +0,0 @@
-[submodule "tools/phptools"]
-	path = tools/phptools
-	url = git://github.com/ralphschindler/PHPTools.git
diff --git a/composer.json b/composer.json
index 8cb3981..29d2be1 100644
--- a/composer.json
+++ b/composer.json
@@ -1,6 +1,6 @@
 {
     "name": "zendframework/zend-config",
-    "description": "Zend\\Config component",
+    "description": "provides a nested object property based user interface for accessing this configuration data within application code",
     "license": "BSD-3-Clause",
     "keywords": [
         "zf2",
@@ -9,11 +9,11 @@
     "homepage": "https://github.com/zendframework/zend-config",
     "autoload": {
         "psr-4": {
-            "Zend\\Config\\": "src/"
+            "Zend\\Config": "src/"
         }
     },
     "require": {
-        "php": ">=5.3.23",
+        "php": ">=5.3.3",
         "zendframework/zend-stdlib": "self.version"
     },
     "require-dev": {
diff --git a/src/Config.php b/src/Config.php
index a36341f..ece2b09 100644
--- a/src/Config.php
+++ b/src/Config.php
@@ -1,36 +1,30 @@
 <?php
 /**
- * Zend Framework
+ * Zend Framework (http://framework.zend.com/)
  *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Config
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @package   Zend_Config
  */
 
 namespace Zend\Config;
 
-use Countable,
-    Iterator,
-    ArrayAccess,
-    Zend\Stdlib\ArrayUtils
-;
+use ArrayAccess;
+use Countable;
+use Iterator;
+use Zend\Stdlib\ArrayUtils;
 
 /**
+ * Provides a property based interface to an array.
+ * The data are read-only unless $allowModifications is set to true
+ * on construction.
+ *
+ * Implements Countable, Iterator and ArrayAccess
+ * to facilitate easy access to the data.
+ *
  * @category   Zend
  * @package    Zend_Config
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Config implements Countable, Iterator, ArrayAccess
 {
@@ -64,16 +58,13 @@ class Config implements Countable, Iterator, ArrayAccess
     protected $skipNextIteration;
 
     /**
-     * Zend_Config provides a property based interface to
-     * an array. The data are read-only unless $allowModifications
-     * is set to true on construction.
+     * Constructor.
      *
-     * Zend_Config also implements Countable, Iterator and ArrayAccess to
-     * facilitate easy access to the data.
+     * Data is read-only unless $allowModifications is set to true
+     * on construction.
      *
      * @param  array   $array
      * @param  boolean $allowModifications
-     * @return void
      */
     public function __construct(array $array, $allowModifications = false)
     {
@@ -126,6 +117,7 @@ public function __get($name)
      * @param  string $name
      * @param  mixed  $value
      * @return void
+     * @throws Exception\RuntimeException
      */
     public function __set($name, $value)
     {
@@ -173,6 +165,7 @@ public function toArray()
         $array = array();
         $data  = $this->data;
 
+        /** @var self $value */
         foreach ($data as $key => $value) {
             if ($value instanceof self) {
                 $array[$key] = $value->toArray();
@@ -200,6 +193,7 @@ public function __isset($name)
      *
      * @param  string $name
      * @return void
+     * @throws Exception\InvalidArgumentException
      */
     public function __unset($name)
     {
@@ -342,11 +336,12 @@ public function offsetUnset($offset)
      * - Items in $merge with INTEGER keys will be appended.
      * - Items in $merge with STRING keys will overwrite current values.
      *
-     * @param  Config $replace
+     * @param  Config $merge
      * @return Config
      */
     public function merge(self $merge)
     {
+        /** @var Config $value */
         foreach ($merge as $key => $value) {
             if (array_key_exists($key, $this->data)) {
                 if (is_int($key)) {
@@ -384,6 +379,7 @@ public function setReadOnly()
     {
         $this->allowModifications = false;
 
+        /** @var Config $value */
         foreach ($this->data as $value) {
             if ($value instanceof self) {
                 $value->setReadOnly();
diff --git a/src/Exception/ExceptionInterface.php b/src/Exception/ExceptionInterface.php
index a167476..81b0132 100644
--- a/src/Exception/ExceptionInterface.php
+++ b/src/Exception/ExceptionInterface.php
@@ -1,21 +1,11 @@
 <?php
 /**
- * Zend Framework
+ * Zend Framework (http://framework.zend.com/)
  *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Config
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @package   Zend_Config
  */
 
 namespace Zend\Config\Exception;
@@ -23,8 +13,7 @@
 /**
  * @category   Zend
  * @package    Zend_Config
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @subpackage Exception
  */
 interface ExceptionInterface
 {}
diff --git a/src/Exception/InvalidArgumentException.php b/src/Exception/InvalidArgumentException.php
index 9d49e89..9738cb0 100644
--- a/src/Exception/InvalidArgumentException.php
+++ b/src/Exception/InvalidArgumentException.php
@@ -1,31 +1,19 @@
 <?php
 /**
- * Zend Framework
+ * Zend Framework (http://framework.zend.com/)
  *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category  Zend
- * @package   Zend_Config
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @package   Zend_Config
  */
 
 namespace Zend\Config\Exception;
 
 /**
- * @category  Zend
- * @package   Zend_Config
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
+ * @category   Zend
+ * @package    Zend_Config
+ * @subpackage Exception
  */
-class InvalidArgumentException extends \InvalidArgumentException implements 
-    ExceptionInterface
+class InvalidArgumentException extends \InvalidArgumentException implements ExceptionInterface
 {}
diff --git a/src/Exception/RuntimeException.php b/src/Exception/RuntimeException.php
index fd19c61..05390c4 100644
--- a/src/Exception/RuntimeException.php
+++ b/src/Exception/RuntimeException.php
@@ -1,30 +1,19 @@
 <?php
 /**
- * Zend Framework
+ * Zend Framework (http://framework.zend.com/)
  *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category  Zend
- * @package   Zend_Config
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @package   Zend_Config
  */
 
 namespace Zend\Config\Exception;
 
 /**
- * @category  Zend
- * @package   Zend_Config
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
+ * @category   Zend
+ * @package    Zend_Config
+ * @subpackage Exception
  */
 class RuntimeException extends \RuntimeException implements ExceptionInterface
 {}
diff --git a/src/Factory.php b/src/Factory.php
index 6964381..4631562 100644
--- a/src/Factory.php
+++ b/src/Factory.php
@@ -1,21 +1,11 @@
 <?php
 /**
- * Zend Framework
+ * Zend Framework (http://framework.zend.com/)
  *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category  Zend
- * @package   Zend_Config
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @package   Zend_Config
  */
 
 namespace Zend\Config;
@@ -23,58 +13,72 @@
 use Zend\Stdlib\ArrayUtils;
 
 /**
- * Declared abstract to prevent instantiation
- * 
  * @category  Zend
  * @package   Zend_Config
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
-abstract class Factory
+class Factory
 {
     /**
-     * Readers used for config files.
+     * Plugin manager for loading readers
+     *
+     * @var null|ReaderPluginManager
+     */
+    public static $readers = null;
+
+    /**
+     * Registered config file extensions.
+     * key is extension, value is reader instance or plugin name
      *
      * @var array
      */
-    protected static $readers = array(
-        'ini' => 'Ini',
-        'xml' => 'Xml'
+    protected static $extensions = array(
+        'ini'  => 'ini',
+        'json' => 'json',
+        'xml'  => 'xml',
+        'yaml' => 'yaml',
     );
 
+
     /**
      * Read a config from a file.
      *
      * @param  string  $filename
-     * @param  boolean $returnConfigObject 
+     * @param  boolean $returnConfigObject
      * @return array|Config
+     * @throws Exception\InvalidArgumentException
+     * @throws Exception\RuntimeException
      */
     public static function fromFile($filename, $returnConfigObject = false)
     {
         $pathinfo = pathinfo($filename);
-        
+
         if (!isset($pathinfo['extension'])) {
             throw new Exception\RuntimeException(sprintf(
                 'Filename "%s" is missing an extension and cannot be auto-detected',
                 $filename
             ));
         }
-        
+
         $extension = strtolower($pathinfo['extension']);
-       
+
         if ($extension === 'php') {
             if (!is_file($filename) || !is_readable($filename)) {
-                throw new Exception\RuntimeException(sprintf('Filename "%s" is either not a file or not readable', $filename));
+                throw new Exception\RuntimeException(sprintf(
+                    "File '%s' doesn't exist or not readable",
+                    $filename
+                ));
             }
-            
+
             $config = include $filename;
-        } elseif (isset(self::$readers[$extension])) {
-            if (is_string(self::$readers[$extension])) {
-                $classname = __NAMESPACE__ . '\\Reader\\' . self::$readers[$extension];
-                self::$readers[$extension] = new $classname();
+        } elseif (isset(self::$extensions[$extension])) {
+            $reader = self::$extensions[$extension];
+            if (!$reader instanceof Reader\ReaderInterface) {
+                $reader = self::getReaderPluginManager()->get($reader);
+                self::$extensions[$extension] = $reader;
             }
-            
-            $config = self::$readers[$extension]->fromFile($filename);
+
+            /** @var Reader\ReaderInterface $reader  */
+            $config = $reader->fromFile($filename);
         } else {
             throw new Exception\RuntimeException(sprintf(
                 'Unsupported config file extension: .%s',
@@ -89,7 +93,7 @@ public static function fromFile($filename, $returnConfigObject = false)
      * Read configuration from multiple files and merge them.
      *
      * @param  array   $files
-     * @param  boolean $returnConfigObject 
+     * @param  boolean $returnConfigObject
      * @return array|Config
      */
     public static function fromFiles(array $files, $returnConfigObject = false)
@@ -102,4 +106,50 @@ public static function fromFiles(array $files, $returnConfigObject = false)
 
         return ($returnConfigObject) ? new Config($config) : $config;
     }
+
+    /**
+     * Set reader plugin manager
+     *
+     * @param ReaderPluginManager $readers
+     */
+    public static function setReaderPluginManager(ReaderPluginManager $readers)
+    {
+        self::$readers = $readers;
+    }
+
+    /**
+     * Get the reader plugin manager
+     *
+     * @return ReaderPluginManager
+     */
+    public static function getReaderPluginManager()
+    {
+        if (static::$readers === null) {
+            static::$readers = new ReaderPluginManager();
+        }
+        return static::$readers;
+    }
+
+    /**
+     * Set config reader for file extension
+     *
+     * @param  string $extension
+     * @param  string|Reader\ReaderInterface $reader
+     * @throws Exception\InvalidArgumentException
+     */
+    public static function registerReader($extension, $reader)
+    {
+        $extension = strtolower($extension);
+
+        if (!is_string($reader) && !$reader instanceof Reader\ReaderInterface) {
+            throw new Exception\InvalidArgumentException(sprintf(
+                'Reader should be plugin name, class name or ' .
+                'instance of %s\Reader\ReaderInterface; recieved "%s"',
+                __NAMESPACE__,
+                (is_object($reader) ? get_class($reader) : gettype($reader))
+            ));
+        }
+
+        self::$extensions[$extension] = $reader;
+    }
 }
diff --git a/src/Processor/Constant.php b/src/Processor/Constant.php
index ed85d2f..9fbae8d 100644
--- a/src/Processor/Constant.php
+++ b/src/Processor/Constant.php
@@ -1,35 +1,19 @@
 <?php
 /**
- * Zend Framework
+ * Zend Framework (http://framework.zend.com/)
  *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Config
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @package   Zend_Config
  */
 
 namespace Zend\Config\Processor;
 
-use Zend\Config\Config,
-    Zend\Config\Exception\InvalidArgumentException,
-    Traversable,
-    ArrayObject;
-
 /**
  * @category   Zend
  * @package    Zend_Config
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @subpackage Processor
  */
 class Constant extends Token implements ProcessorInterface
 {
@@ -69,12 +53,13 @@ public function getUserOnly()
     /**
      * Should we use only user-defined constants?
      *
-     * @param $userOnly
-     * @return bool
+     * @param  bool $userOnly
+     * @return Constant
      */
     public function setUserOnly($userOnly)
     {
-        return $this->userOnly = $userOnly;
+        $this->userOnly = (bool) $userOnly;
+        return $this;
     }
 
     /**
@@ -101,5 +86,4 @@ public function getTokens()
     {
         return $this->tokens;
     }
-
 }
diff --git a/src/Processor/Filter.php b/src/Processor/Filter.php
index 58accc8..1ed0f31 100644
--- a/src/Processor/Filter.php
+++ b/src/Processor/Filter.php
@@ -1,36 +1,23 @@
 <?php
 /**
- * Zend Framework
+ * Zend Framework (http://framework.zend.com/)
  *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Config
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @package   Zend_Config
  */
 
 namespace Zend\Config\Processor;
 
-use Zend\Config\Config,
-    Zend\Config\Exception,
-    Zend\Filter\FilterInterface as ZendFilter,
-    Traversable,
-    ArrayObject;
+use Zend\Config\Config;
+use Zend\Config\Exception;
+use Zend\Filter\FilterInterface as ZendFilter;
 
 /**
  * @category   Zend
  * @package    Zend_Config
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @subpackage Processor
  */
 class Filter implements ProcessorInterface
 {
@@ -50,31 +37,34 @@ public function __construct(ZendFilter $filter)
     }
 
     /**
-     * @return ZendFilter
+     * @param  ZendFilter $filter
+     * @return Filter
      */
-    public function getFilter()
+    public function setFilter(ZendFilter $filter)
     {
-        return $this->filter;
+        $this->filter = $filter;
+        return $this;
     }
 
     /**
-     * @param ZendFilter $filter
+     * @return ZendFilter
      */
-    public function setFilter(ZendFilter $filter)
+    public function getFilter()
     {
-        $this->filter = $filter;
+        return $this->filter;
     }
 
     /**
      * Process
-     * 
+     *
      * @param  Config $config
-     * @return Config 
+     * @return Config
+     * @throws Exception\InvalidArgumentException
      */
     public function process(Config $config)
     {
         if ($config->isReadOnly()) {
-            throw new Exception\InvalidArgumentException('Cannot parse config because it is read-only');
+            throw new Exception\InvalidArgumentException('Cannot process config because it is read-only');
         }
 
         /**
@@ -94,7 +84,7 @@ public function process(Config $config)
     /**
      * Process a single value
      *
-     * @param $value
+     * @param  mixed $value
      * @return mixed
      */
     public function processValue($value)
diff --git a/src/Processor/ProcessorInterface.php b/src/Processor/ProcessorInterface.php
index 0994ba2..520a18b 100644
--- a/src/Processor/ProcessorInterface.php
+++ b/src/Processor/ProcessorInterface.php
@@ -1,21 +1,11 @@
 <?php
 /**
- * Zend Framework
+ * Zend Framework (http://framework.zend.com/)
  *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Config
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @package   Zend_Config
  */
 
 namespace Zend\Config\Processor;
@@ -25,15 +15,14 @@
 /**
  * @category   Zend
  * @package    Zend_Config
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @subpackage Processor
  */
 interface ProcessorInterface
 {
     /**
      * Process the whole Config structure and recursively parse all its values.
      *
-     * @param Config $value
+     * @param  Config $value
      * @return Config
      */
     public function process(Config $value);
@@ -41,7 +30,7 @@ public function process(Config $value);
     /**
      * Process a single value
      *
-     * @param $value
+     * @param  mixed $value
      * @return mixed
      */
     public function processValue($value);
diff --git a/src/Processor/Queue.php b/src/Processor/Queue.php
index 2aafd61..fb276ba 100644
--- a/src/Processor/Queue.php
+++ b/src/Processor/Queue.php
@@ -1,51 +1,41 @@
 <?php
 /**
- * Zend Framework
+ * Zend Framework (http://framework.zend.com/)
  *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Config
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @package   Zend_Config
  */
 
 namespace Zend\Config\Processor;
 
-use Zend\Config\Config,
-    Zend\Config\Exception\InvalidArgumentException,
-    Zend\Stdlib\PriorityQueue;
+use Zend\Config\Config;
+use Zend\Config\Exception;
+use Zend\Stdlib\PriorityQueue;
 
 /**
  * @category   Zend
  * @package    Zend_Config
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @subpackage Processor
  */
 class Queue extends PriorityQueue implements ProcessorInterface
 {
     /**
      * Process the whole config structure with each parser in the queue.
      *
-     * @param \Zend\Config\Config $config
-     * @throws \Zend\Config\Exception\InvalidArgumentException
+     * @param  Config $config
+     * @return Config
+     * @throws Exception\InvalidArgumentException
      */
     public function process(Config $config)
     {
         if ($config->isReadOnly()) {
-            throw new InvalidArgumentException('Cannot parse config because it is read-only');
+            throw new Exception\InvalidArgumentException('Cannot process config because it is read-only');
         }
 
         foreach ($this as $parser) {
-            /** @var $parser \Zend\Config\Processor\ProcessorInterface */
+            /** @var $parser ProcessorInterface */
             $parser->process($config);
         }
     }
@@ -53,13 +43,13 @@ public function process(Config $config)
     /**
      * Process a single value
      *
-     * @param $value
+     * @param  mixed $value
      * @return mixed
      */
     public function processValue($value)
     {
         foreach ($this as $parser) {
-            /** @var $parser \Zend\Config\Processor\ProcessorInterface */
+            /** @var $parser ProcessorInterface */
             $value = $parser->processValue($value);
         }
 
diff --git a/src/Processor/Token.php b/src/Processor/Token.php
index 24b6aec..022daf5 100644
--- a/src/Processor/Token.php
+++ b/src/Processor/Token.php
@@ -1,35 +1,23 @@
 <?php
 /**
- * Zend Framework
+ * Zend Framework (http://framework.zend.com/)
  *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Config
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @package   Zend_Config
  */
 
 namespace Zend\Config\Processor;
 
-use Zend\Config\Config,
-    Zend\Config\Exception,
-    Traversable,
-    ArrayObject;
+use Traversable;
+use Zend\Config\Config;
+use Zend\Config\Exception;
 
 /**
  * @category   Zend
  * @package    Zend_Config
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @subpackage Processor
  */
 class Token implements ProcessorInterface
 {
@@ -65,12 +53,12 @@ class Token implements ProcessorInterface
      * Token Processor walks through a Config structure and replaces all
      * occurences of tokens with supplied values.
      *
-     * @param  array|\Zend\Config\Config|ArrayObject|\Traversable   $tokens  Associative array of TOKEN => value
-     *                                                                      to replace it with
-     * @param string $prefix
-     * @param string $suffix
+     * @param  array|Config|Traversable   $tokens  Associative array of TOKEN => value
+     *                                             to replace it with
+     * @param    string $prefix
+     * @param    string $suffix
      * @internal param array $options
-     * @return \Zend\Config\Processor\Token
+     * @return   Token
      */
     public function __construct($tokens = array(), $prefix = '', $suffix = '')
     {
@@ -80,51 +68,53 @@ public function __construct($tokens = array(), $prefix = '', $suffix = '')
     }
 
     /**
-     * @return string
+     * @param  string $prefix
+     * @return Token
      */
-    public function getPrefix()
+    public function setPrefix($prefix)
     {
-        return $this->prefix;
+        // reset map
+        $this->map = null;
+        $this->prefix = $prefix;
+        return $this;
     }
 
     /**
      * @return string
      */
-    public function getSuffix()
+    public function getPrefix()
     {
-        return $this->suffix;
+        return $this->prefix;
     }
 
     /**
-     * @param string $prefix
-     * @return mixed
+     * @param  string $suffix
+     * @return Token
      */
-    public function setPrefix($prefix)
+    public function setSuffix($suffix)
     {
         // reset map
         $this->map = null;
+        $this->suffix = $suffix;
 
-        return $this->prefix = $prefix;
+        return $this;
     }
 
     /**
-     * @param string $suffix
      * @return string
      */
-    public function setSuffix($suffix)
+    public function getSuffix()
     {
-        // reset map
-        $this->map = null;
-
-        return $this->suffix = $suffix;
+        return $this->suffix;
     }
 
     /**
      * Set token registry.
      *
-     * @param  array|\Zend\Config\Config|\ArrayObject|\Traversable   $tokens  Associative array of TOKEN => value
-     *                                                                      to replace it with
-     * @throws \Zend\Config\Exception\InvalidArgumentException
+     * @param  array|Config|Traversable  $tokens  Associative array of TOKEN => value
+     *                                            to replace it with
+     * @return Token
+     * @throws Exception\InvalidArgumentException
      */
     public function setTokens($tokens)
     {
@@ -132,7 +122,7 @@ public function setTokens($tokens)
             $this->tokens = $tokens;
         } elseif ($tokens instanceof Config) {
             $this->tokens = $tokens->toArray();
-        } elseif ($tokens instanceof \Traversable) {
+        } elseif ($tokens instanceof Traversable) {
             $this->tokens = array();
             foreach ($tokens as $key => $val) {
                 $this->tokens[$key] = $val;
@@ -143,10 +133,13 @@ public function setTokens($tokens)
 
         // reset map
         $this->map = null;
+
+        return $this;
     }
 
     /**
      * Get current token registry.
+     *
      * @return array
      */
     public function getTokens()
@@ -157,9 +150,10 @@ public function getTokens()
     /**
      * Add new token.
      *
-     * @param $token
-     * @param $value
-     * @throws \Zend\Config\Exception\InvalidArgumentException
+     * @param  string $token
+     * @param  mixed $value
+     * @return Token
+     * @throws Exception\InvalidArgumentException
      */
     public function addToken($token, $value)
     {
@@ -170,14 +164,16 @@ public function addToken($token, $value)
 
         // reset map
         $this->map = null;
+
+        return $this;
     }
 
     /**
      * Add new token.
      *
-     * @param $token
-     * @param $value
-     * @throws \Zend\Config\Exception\InvalidArgumentException
+     * @param string $token
+     * @param mixed $value
+     * @return Token
      */
     public function setToken($token, $value)
     {
@@ -204,11 +200,12 @@ protected function buildMap()
      *
      * @param  Config $config
      * @return Config
+     * @throws InvalidArgumentException
      */
     public function process(Config $config)
     {
         if ($config->isReadOnly()) {
-            throw new Exception\InvalidArgumentException('Cannot parse config because it is read-only');
+            throw new Exception\InvalidArgumentException('Cannot process config because it is read-only');
         }
 
         if ($this->map === null) {
@@ -244,6 +241,7 @@ public function processValue($value)
         }
         $keys = array_keys($this->map);
         $values = array_values($this->map);
+
         return str_replace($keys, $values, $value);
     }
 }
diff --git a/src/Processor/Translator.php b/src/Processor/Translator.php
index 4bcf899..bb2c623 100644
--- a/src/Processor/Translator.php
+++ b/src/Processor/Translator.php
@@ -1,37 +1,23 @@
 <?php
 /**
- * Zend Framework
+ * Zend Framework (http://framework.zend.com/)
  *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Config
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @package   Zend_Config
  */
 
 namespace Zend\Config\Processor;
 
-use Zend\Config\Config,
-    Zend\Config\Exception\InvalidArgumentException,
-    Zend\Translator\Translator as ZendTranslator,
-    Zend\Locale\Locale,
-    Traversable,
-    ArrayObject;
+use Zend\Config\Config;
+use Zend\Config\Exception;
+use Zend\I18n\Translator\Translator as ZendTranslator;
 
 /**
  * @category   Zend
  * @package    Zend_Config
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @subpackage Processor
  */
 class Translator implements ProcessorInterface
 {
@@ -41,24 +27,40 @@ class Translator implements ProcessorInterface
     protected $translator;
 
     /**
-     * @var Locale|string|null
+     * @var string|null
      */
     protected $locale = null;
 
     /**
-     * Translator uses the supplied Zend\Translator\Translator to find and
-     * translate language strings in config.
+     * @var string
+     */
+    protected $textDomain = 'default';
+
+    /**
+     * Translator uses the supplied Zend\I18n\Translator\Translator to find
+     * and translate language strings in config.
      *
      * @param  ZendTranslator $translator
-     * @param  Locale|string|null $locale
-     * @return ZendTranslator
+     * @param  string $textDomain
+     * @param  string|null $locale
      */
-    public function __construct(ZendTranslator $translator, $locale = null)
+    public function __construct(ZendTranslator $translator, $textDomain = 'default', $locale = null)
     {
         $this->setTranslator($translator);
+        $this->setTextDomain($textDomain);
         $this->setLocale($locale);
     }
 
+    /**
+     * @param  ZendTranslator $translator
+     * @return Translator
+     */
+    public function setTranslator(ZendTranslator $translator)
+    {
+        $this->translator = $translator;
+        return $this;
+    }
+
     /**
      * @return ZendTranslator
      */
@@ -68,15 +70,17 @@ public function getTranslator()
     }
 
     /**
-     * @param ZendTranslator $translator
+     * @param  string|null $locale
+     * @return Translator
      */
-    public function setTranslator(ZendTranslator $translator)
+    public function setLocale($locale)
     {
-        $this->translator = $translator;
+        $this->locale = $locale;
+        return $this;
     }
 
     /**
-     * @return Locale|string|null
+     * @return string|null
      */
     public function getLocale()
     {
@@ -84,24 +88,34 @@ public function getLocale()
     }
 
     /**
-     * @param Locale|string|null $locale
+     * @param  string $textDomain
+     * @return Translator
      */
-    public function setLocale($locale)
+    public function setTextDomain($textDomain)
     {
-        $this->locale = $locale;
+        $this->textDomain = $textDomain;
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getTextDomain()
+    {
+        return $this->textDomain;
     }
 
     /**
      * Process
      *
-     * @param Config $config
+     * @param  Config $config
      * @return Config
-     * @throws InvalidArgumentException
+     * @throws Exception\InvalidArgumentException
      */
     public function process(Config $config)
     {
         if ($config->isReadOnly()) {
-            throw new InvalidArgumentException('Cannot parse config because it is read-only');
+            throw new Exception\InvalidArgumentException('Cannot process config because it is read-only');
         }
 
         /**
@@ -111,7 +125,7 @@ public function process(Config $config)
             if ($val instanceof Config) {
                 $this->process($val);
             } else {
-                $config->$key = $this->translator->translate($val, $this->locale);
+                $config->{$key} = $this->translator->translate($val, $this->textDomain, $this->locale);
             }
         }
 
@@ -126,7 +140,7 @@ public function process(Config $config)
      */
     public function processValue($value)
     {
-        return $this->translator->translate($value, $this->locale);
+        return $this->translator->translate($value, $this->textDomain, $this->locale);
     }
 
 }
diff --git a/src/Reader/Ini.php b/src/Reader/Ini.php
index 34d6412..6498c0f 100644
--- a/src/Reader/Ini.php
+++ b/src/Reader/Ini.php
@@ -1,22 +1,11 @@
 <?php
 /**
- * Zend Framework
+ * Zend Framework (http://framework.zend.com/)
  *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Config
- * @subpackage Reader
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @package   Zend_Config
  */
 
 namespace Zend\Config\Reader;
@@ -29,8 +18,6 @@
  * @category   Zend
  * @package    Zend_Config
  * @subpackage Reader
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Ini implements ReaderInterface
 {
@@ -76,12 +63,17 @@ public function getNestSeparator()
      * @see    ReaderInterface::fromFile()
      * @param  string $filename
      * @return array
+     * @throws Exception\InvalidArgumentException
      */
     public function fromFile($filename)
     {
-        if (!file_exists($filename)) {
-            throw new Exception\RuntimeException("The file $filename doesn't exists.");
+        if (!is_file($filename) || !is_readable($filename)) {
+            throw new Exception\RuntimeException(sprintf(
+                "File '%s' doesn't exist or not readable",
+                $filename
+            ));
         }
+
         $this->directory = dirname($filename);
 
         set_error_handler(
@@ -94,16 +86,16 @@ function($error, $message = '', $file = '', $line = 0) use ($filename) {
         );
         $ini = parse_ini_file($filename, true);
         restore_error_handler();
-        
+
         return $this->process($ini);
     }
 
     /**
      * fromString(): defined by Reader interface.
      *
-     * @see    ReaderInterface::fromString()
      * @param  string $string
-     * @return array
+     * @return array|bool
+     * @throws Exception\RuntimeException
      */
     public function fromString($string)
     {
@@ -122,7 +114,7 @@ function($error, $message = '', $file = '', $line = 0) {
         );
         $ini = parse_ini_string($string, true);
         restore_error_handler();
-        
+
         return $this->process($ini);
     }
 
@@ -171,6 +163,7 @@ protected function processSection(array $section)
      * @param  string $value
      * @param  array  $config
      * @return array
+     * @throws Exception\RuntimeException
      */
     protected function processKey($key, $value, array &$config)
     {
@@ -186,7 +179,9 @@ protected function processKey($key, $value, array &$config)
                     $config[$pieces[0]] = array();
                 }
             } elseif (!is_array($config[$pieces[0]])) {
-                throw new Exception\RuntimeException(sprintf('Cannot create sub-key for "%s", as key already exists', $pieces[0]));
+                throw new Exception\RuntimeException(sprintf(
+                    'Cannot create sub-key for "%s", as key already exists', $pieces[0]
+                ));
             }
 
             $this->processKey($pieces[1], $value, $config[$pieces[0]]);
diff --git a/src/Reader/Json.php b/src/Reader/Json.php
index 3f93a28..5d6b7bd 100644
--- a/src/Reader/Json.php
+++ b/src/Reader/Json.php
@@ -1,37 +1,25 @@
 <?php
 /**
- * Zend Framework
+ * Zend Framework (http://framework.zend.com/)
  *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Config
- * @subpackage Reader
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @package   Zend_Config
  */
 
 namespace Zend\Config\Reader;
 
-use Zend\Config\Exception,
-    Zend\Json\Json as JsonFormat;
+use Zend\Config\Exception;
+use Zend\Json\Exception as JsonException;
+use Zend\Json\Json as JsonFormat;
 
 /**
- * Json config reader.
+ * JSON config reader.
  *
  * @category   Zend
  * @package    Zend_Config
  * @subpackage Reader
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Json implements ReaderInterface
 {
@@ -41,27 +29,32 @@ class Json implements ReaderInterface
      * @var string
      */
     protected $directory;
+
     /**
      * fromFile(): defined by Reader interface.
      *
      * @see    ReaderInterface::fromFile()
      * @param  string $filename
      * @return array
+     * @throws Exception\RuntimeException
      */
     public function fromFile($filename)
     {
-        if (!file_exists($filename)) {
-            throw new Exception\RuntimeException("The file $filename doesn't exists.");
+        if (!is_file($filename) || !is_readable($filename)) {
+            throw new Exception\RuntimeException(sprintf(
+                "File '%s' doesn't exist or not readable",
+                $filename
+            ));
         }
-        
+
         $this->directory = dirname($filename);
-        
+
         try {
             $config = JsonFormat::decode(file_get_contents($filename), JsonFormat::TYPE_ARRAY);
-        } catch (\Zend\Json\Exception\RuntimeException $e) {
+        } catch (JsonException\RuntimeException $e) {
             throw new Exception\RuntimeException($e->getMessage());
-        }    
-        
+        }
+
         return $this->process($config);
     }
 
@@ -70,42 +63,47 @@ public function fromFile($filename)
      *
      * @see    ReaderInterface::fromString()
      * @param  string $string
-     * @return array
+     * @return array|bool
+     * @throws Exception\RuntimeException
      */
     public function fromString($string)
     {
         if (empty($string)) {
             return array();
         }
+
         $this->directory = null;
-        
+
         try {
             $config = JsonFormat::decode($string, JsonFormat::TYPE_ARRAY);
-        } catch (\Zend\Json\Exception\RuntimeException $e) {
+        } catch (JsonException\RuntimeException $e) {
             throw new Exception\RuntimeException($e->getMessage());
-        }    
-        
+        }
+
         return $this->process($config);
     }
+
     /**
      * Process the array for @include
-     * 
+     *
      * @param  array $data
-     * @return array 
+     * @return array
+     * @throws Exception\RuntimeException
      */
-    protected function process(array $data) {
+    protected function process(array $data)
+    {
         foreach ($data as $key => $value) {
             if (is_array($value)) {
                 $data[$key] = $this->process($value);
             }
-            if (trim($key)==='@include') {
+            if (trim($key) === '@include') {
                 if ($this->directory === null) {
-                    throw new Exception\RuntimeException('Cannot process @include statement for a json string');
+                    throw new Exception\RuntimeException('Cannot process @include statement for a JSON string');
                 }
                 $reader = clone $this;
                 unset($data[$key]);
                 $data = array_replace_recursive($data, $reader->fromFile($this->directory . '/' . $value));
-            } 
+            }
         }
         return $data;
     }
diff --git a/src/Reader/ReaderInterface.php b/src/Reader/ReaderInterface.php
index e10280c..4ecaf8d 100644
--- a/src/Reader/ReaderInterface.php
+++ b/src/Reader/ReaderInterface.php
@@ -1,30 +1,19 @@
 <?php
 /**
- * Zend Framework
+ * Zend Framework (http://framework.zend.com/)
  *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category  Zend
- * @package   Zend_Config
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @package   Zend_Config
  */
 
 namespace Zend\Config\Reader;
 
 /**
- * @category  Zend
- * @package   Zend_Config
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
+ * @category   Zend
+ * @package    Zend_Config
+ * @subpackage Reader
  */
 interface ReaderInterface
 {
diff --git a/src/Reader/Xml.php b/src/Reader/Xml.php
index e679839..98a1d0f 100644
--- a/src/Reader/Xml.php
+++ b/src/Reader/Xml.php
@@ -1,28 +1,17 @@
 <?php
 /**
- * Zend Framework
+ * Zend Framework (http://framework.zend.com/)
  *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Config
- * @subpackage Reader
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @package   Zend_Config
  */
 
 namespace Zend\Config\Reader;
 
-use XMLReader,
-    Zend\Config\Exception;
+use XMLReader;
+use Zend\Config\Exception;
 
 /**
  * XML config reader.
@@ -30,8 +19,6 @@
  * @category   Zend
  * @package    Zend_Config
  * @subpackage Reader
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Xml implements ReaderInterface
 {
@@ -55,7 +42,9 @@ class Xml implements ReaderInterface
      * @var array
      */
     protected $textNodes = array(
-        XMLReader::TEXT, XMLReader::CDATA, XMLReader::WHITESPACE,
+        XMLReader::TEXT,
+        XMLReader::CDATA,
+        XMLReader::WHITESPACE,
         XMLReader::SIGNIFICANT_WHITESPACE
     );
 
@@ -65,15 +54,19 @@ class Xml implements ReaderInterface
      * @see    ReaderInterface::fromFile()
      * @param  string $filename
      * @return array
+     * @throws Exception\RuntimeException
      */
     public function fromFile($filename)
     {
-        if (!file_exists($filename)) {
-            throw new Exception\RuntimeException("The file $filename doesn't exists.");
+        if (!is_file($filename) || !is_readable($filename)) {
+            throw new Exception\RuntimeException(sprintf(
+                "File '%s' doesn't exist or not readable",
+                $filename
+            ));
         }
-        $this->reader = new XMLReader();
 
-        $this->reader->open($filename, null, LIBXML_XINCLUDE);   
+        $this->reader = new XMLReader();
+        $this->reader->open($filename, null, LIBXML_XINCLUDE);
 
         $this->directory = dirname($filename);
 
@@ -87,7 +80,7 @@ function($error, $message = '', $file = '', $line = 0) use ($filename) {
         );
         $return = $this->process();
         restore_error_handler();
-        
+
         return $return;
     }
 
@@ -96,7 +89,8 @@ function($error, $message = '', $file = '', $line = 0) use ($filename) {
      *
      * @see    ReaderInterface::fromString()
      * @param  string $string
-     * @return array
+     * @return array|bool
+     * @throws Exception\RuntimeException
      */
     public function fromString($string)
     {
@@ -104,7 +98,7 @@ public function fromString($string)
             return array();
         }
         $this->reader = new XMLReader();
-        
+
         $this->reader->xml($string, null, LIBXML_XINCLUDE);
 
         $this->directory = null;
@@ -119,7 +113,7 @@ function($error, $message = '', $file = '', $line = 0) {
         );
         $return = $this->process();
         restore_error_handler();
-        
+
         return $return;
     }
 
@@ -181,7 +175,7 @@ protected function processNextElement()
                 $text .= $this->reader->value;
             }
         }
-        
+
         return $children ?: $text;
     }
 
diff --git a/src/Reader/Yaml.php b/src/Reader/Yaml.php
index 5f173a7..c33ef29 100644
--- a/src/Reader/Yaml.php
+++ b/src/Reader/Yaml.php
@@ -1,22 +1,11 @@
 <?php
 /**
- * Zend Framework
+ * Zend Framework (http://framework.zend.com/)
  *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Config
- * @subpackage Reader
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @package   Zend_Config
  */
 
 namespace Zend\Config\Reader;
@@ -24,35 +13,36 @@
 use Zend\Config\Exception;
 
 /**
- * Yaml config reader.
+ * YAML config reader.
  *
  * @category   Zend
  * @package    Zend_Config
  * @subpackage Reader
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Yaml implements ReaderInterface
 {
     /**
-     * Directory of the JSON file
-     * 
+     * Directory of the YAML file
+     *
      * @var string
      */
     protected $directory;
+
     /**
-     * Yaml decoder callback
-     * 
+     * YAML decoder callback
+     *
      * @var callable
      */
     protected $yamlDecoder;
+
     /**
      * Constructor
-     * 
-     * @param callable $yamlDecoder 
+     *
+     * @param callable $yamlDecoder
      */
-    public function __construct($yamlDecoder=null) {
-        if (!empty($yamlDecoder)) {
+    public function __construct($yamlDecoder = null)
+    {
+        if ($yamlDecoder !== null) {
             $this->setYamlDecoder($yamlDecoder);
         } else {
             if (function_exists('yaml_parse')) {
@@ -60,52 +50,63 @@ public function __construct($yamlDecoder=null) {
             }
         }
     }
-    /**
-     * Get callback for decoding YAML
-     *
-     * @return callable
-     */
-    public function getYamlDecoder()
-    {
-        return $this->yamlDecoder;
-    }
+
     /**
      * Set callback for decoding YAML
      *
-     * @param  callable $yamlDecoder the decoder to set
+     * @param  string|callable $yamlDecoder the decoder to set
      * @return Yaml
+     * @throws Exception\InvalidArgumentException
      */
     public function setYamlDecoder($yamlDecoder)
     {
         if (!is_callable($yamlDecoder)) {
-            throw new Exception\InvalidArgumentException('Invalid parameter to setYamlDecoder() - must be callable');
+            throw new Exception\RuntimeException(
+                'Invalid parameter to setYamlDecoder() - must be callable'
+            );
         }
         $this->yamlDecoder = $yamlDecoder;
         return $this;
     }
+
+    /**
+     * Get callback for decoding YAML
+     *
+     * @return callable
+     */
+    public function getYamlDecoder()
+    {
+        return $this->yamlDecoder;
+    }
+
     /**
      * fromFile(): defined by Reader interface.
      *
      * @see    ReaderInterface::fromFile()
      * @param  string $filename
      * @return array
+     * @throws Exception\RuntimeException
      */
     public function fromFile($filename)
     {
-        if (!file_exists($filename)) {
-            throw new Exception\RuntimeException("The file $filename doesn't exists.");
+        if (!is_file($filename) || !is_readable($filename)) {
+            throw new Exception\RuntimeException(sprintf(
+                "File '%s' doesn't exist or not readable",
+                $filename
+            ));
         }
+
         if (null === $this->getYamlDecoder()) {
              throw new Exception\RuntimeException("You didn't specify a Yaml callback decoder");
         }
-        
+
         $this->directory = dirname($filename);
-        
+
         $config = call_user_func($this->getYamlDecoder(), file_get_contents($filename));
         if (null === $config) {
             throw new Exception\RuntimeException("Error parsing YAML data");
-        }  
-        
+        }
+
         return $this->process($config);
     }
 
@@ -114,7 +115,8 @@ public function fromFile($filename)
      *
      * @see    ReaderInterface::fromString()
      * @param  string $string
-     * @return array
+     * @return array|bool
+     * @throws Exception\RuntimeException
      */
     public function fromString($string)
     {
@@ -124,35 +126,38 @@ public function fromString($string)
         if (empty($string)) {
             return array();
         }
-        
+
         $this->directory = null;
-        
+
         $config = call_user_func($this->getYamlDecoder(), $string);
         if (null === $config) {
             throw new Exception\RuntimeException("Error parsing YAML data");
-        }   
-        
+        }
+
         return $this->process($config);
     }
+
     /**
      * Process the array for @include
-     * 
+     *
      * @param  array $data
-     * @return array 
+     * @return array
+     * @throws Exception\RuntimeException
      */
-    protected function process(array $data) {
+    protected function process(array $data)
+    {
         foreach ($data as $key => $value) {
             if (is_array($value)) {
                 $data[$key] = $this->process($value);
             }
-            if (trim($key)==='@include') {
+            if (trim($key) === '@include') {
                 if ($this->directory === null) {
                     throw new Exception\RuntimeException('Cannot process @include statement for a json string');
                 }
                 $reader = clone $this;
                 unset($data[$key]);
                 $data = array_replace_recursive($data, $reader->fromFile($this->directory . '/' . $value));
-            } 
+            }
         }
         return $data;
     }
diff --git a/src/ReaderPluginManager.php b/src/ReaderPluginManager.php
new file mode 100644
index 0000000..2614fd0
--- /dev/null
+++ b/src/ReaderPluginManager.php
@@ -0,0 +1,54 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @package   Zend_Config
+ */
+
+namespace Zend\Config;
+
+use Zend\ServiceManager\AbstractPluginManager;
+
+/**
+ * @category   Zend
+ * @package    Zend_Config
+ */
+class ReaderPluginManager extends AbstractPluginManager
+{
+    /**
+     * Default set of readers
+     *
+     * @var array
+     */
+    protected $invokableClasses = array(
+        'ini'  => 'Zend\Config\Reader\Ini',
+        'json' => 'Zend\Config\Reader\Json',
+        'xml'  => 'Zend\Config\Reader\Xml',
+        'yaml' => 'Zend\Config\Reader\Yaml',
+    );
+
+    /**
+     * Validate the plugin
+     * Checks that the reader loaded is an instance of Reader\ReaderInterface.
+     *
+     * @param  Reader\ReaderInterface $plugin
+     * @return void
+     * @throws Exception\InvalidArgumentException if invalid
+     */
+    public function validatePlugin($plugin)
+    {
+        if ($plugin instanceof Reader\ReaderInterface) {
+            // we're okay
+            return;
+        }
+
+        throw new Exception\InvalidArgumentException(sprintf(
+            'Plugin of type %s is invalid; must implement %s\Reader\ReaderInterface',
+            (is_object($plugin) ? get_class($plugin) : gettype($plugin)),
+            __NAMESPACE__
+        ));
+    }
+}
diff --git a/src/Writer/AbstractWriter.php b/src/Writer/AbstractWriter.php
index 7b77a63..4726075 100644
--- a/src/Writer/AbstractWriter.php
+++ b/src/Writer/AbstractWriter.php
@@ -1,35 +1,24 @@
 <?php
 /**
- * Zend Framework
+ * Zend Framework (http://framework.zend.com/)
  *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Config
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @package   Zend_Config
  */
 
 namespace Zend\Config\Writer;
 
-use Zend\Config\Exception,
-    Zend\Config\Config,
-    Zend\Stdlib\ArrayUtils,
-    Traversable;
+use Traversable;
+use Zend\Config\Config;
+use Zend\Config\Exception;
+use Zend\Stdlib\ArrayUtils;
 
 /**
  * @category   Zend
  * @package    Zend_Config
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @subpackage Writer
  */
 abstract class AbstractWriter implements WriterInterface
 {
@@ -41,19 +30,20 @@ abstract class AbstractWriter implements WriterInterface
      * @param  mixed   $config
      * @param  boolean $exclusiveLock
      * @return void
+     * @throws Exception\InvalidArgumentException
+     * @throws Exception\RuntimeException
      */
     public function toFile($filename, $config, $exclusiveLock = true)
     {
         if (empty($filename)) {
             throw new Exception\InvalidArgumentException('No file name specified');
         }
-        
-        $flags = 0;
 
+        $flags = 0;
         if ($exclusiveLock) {
             $flags |= LOCK_EX;
         }
-        
+
         set_error_handler(
             function($error, $message = '', $file = '', $line = 0) use ($filename) {
                 throw new Exception\RuntimeException(sprintf(
@@ -62,7 +52,7 @@ function($error, $message = '', $file = '', $line = 0) use ($filename) {
                 ), $error);
             }, E_WARNING
         );
-        file_put_contents($filename, $this->toString($config), $exclusiveLock);
+        file_put_contents($filename, $this->toString($config), $flags);
         restore_error_handler();
     }
 
@@ -71,7 +61,8 @@ function($error, $message = '', $file = '', $line = 0) use ($filename) {
      *
      * @see    WriterInterface::toString()
      * @param  mixed   $config
-     * @return void
+     * @return string
+     * @throws Exception\InvalidArgumentException
      */
     public function toString($config)
     {
@@ -85,8 +76,7 @@ public function toString($config)
     }
 
     /**
-     * Process an array configuration.
-     *
+     * @param array $config
      * @return string
      */
     abstract protected function processConfig(array $config);
diff --git a/src/Writer/Ini.php b/src/Writer/Ini.php
index 164097f..cae2dc0 100644
--- a/src/Writer/Ini.php
+++ b/src/Writer/Ini.php
@@ -1,21 +1,11 @@
 <?php
 /**
- * Zend Framework
+ * Zend Framework (http://framework.zend.com/)
  *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Config
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @package   Zend_Config
  */
 
 namespace Zend\Config\Writer;
@@ -25,8 +15,7 @@
 /**
  * @category   Zend
  * @package    Zend_Config
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @subpackage Writer
  */
 class Ini extends AbstractWriter
 {
@@ -48,7 +37,7 @@ class Ini extends AbstractWriter
     /**
      * Set nest separator.
      *
-     * @param  stirng $separator
+     * @param  string $separator
      * @return self
      */
     public function setNestSeparator($separator)
@@ -128,6 +117,7 @@ public function processConfig(array $config)
      * Add a branch to an INI string recursively.
      *
      * @param  array $config
+     * @param  array $parents
      * @return string
      */
     protected function addBranch(array $config, $parents = array())
@@ -155,6 +145,7 @@ protected function addBranch(array $config, $parents = array())
      *
      * @param  mixed $value
      * @return string
+     * @throws Exception\RuntimeException
      */
     protected function prepareValue($value)
     {
diff --git a/src/Writer/Json.php b/src/Writer/Json.php
index 5020f5b..3d544ab 100644
--- a/src/Writer/Json.php
+++ b/src/Writer/Json.php
@@ -1,32 +1,21 @@
 <?php
 /**
- * Zend Framework
+ * Zend Framework (http://framework.zend.com/)
  *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Config
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @package   Zend_Config
  */
 
 namespace Zend\Config\Writer;
 
-use Zend\Config\Exception,
-    Zend\Json\Json as JsonFormat;
+use Zend\Json\Json as JsonFormat;
+
 /**
  * @category   Zend
  * @package    Zend_Config
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @subpackage Writer
  */
 class Json extends AbstractWriter
 {
diff --git a/src/Writer/PhpArray.php b/src/Writer/PhpArray.php
index 3fb69a2..e7b6a46 100644
--- a/src/Writer/PhpArray.php
+++ b/src/Writer/PhpArray.php
@@ -1,21 +1,11 @@
 <?php
 /**
- * Zend Framework
+ * Zend Framework (http://framework.zend.com/)
  *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Config
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @package   Zend_Config
  */
 
 namespace Zend\Config\Writer;
@@ -23,8 +13,7 @@
 /**
  * @category   Zend
  * @package    Zend_Config
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @subpackage Writer
  */
 class PhpArray extends AbstractWriter
 {
@@ -36,7 +25,6 @@ class PhpArray extends AbstractWriter
      */
     public function processConfig(array $config)
     {
-
         $arrayString = "<?php\n"
                      . "return " . var_export($config, true) . ";\n";
 
diff --git a/src/Writer/WriterInterface.php b/src/Writer/WriterInterface.php
index b8aa888..b81e961 100644
--- a/src/Writer/WriterInterface.php
+++ b/src/Writer/WriterInterface.php
@@ -1,30 +1,19 @@
 <?php
 /**
- * Zend Framework
+ * Zend Framework (http://framework.zend.com/)
  *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category  Zend
- * @package   Zend_Config
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @package   Zend_Config
  */
 
 namespace Zend\Config\Writer;
 
 /**
- * @category  Zend
- * @package   Zend_Config
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
+ * @category   Zend
+ * @package    Zend_Config
+ * @subpackage Writer
  */
 interface WriterInterface
 {
diff --git a/src/Writer/Xml.php b/src/Writer/Xml.php
index 954cfad..844a38f 100644
--- a/src/Writer/Xml.php
+++ b/src/Writer/Xml.php
@@ -1,33 +1,22 @@
 <?php
 /**
- * Zend Framework
+ * Zend Framework (http://framework.zend.com/)
  *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Config
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @package   Zend_Config
  */
 
 namespace Zend\Config\Writer;
 
-use Zend\Config\Exception,
-    XMLWriter;
+use XMLWriter;
+use Zend\Config\Exception;
 
 /**
  * @category   Zend
  * @package    Zend_Config
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @subpackage Writer
  */
 class Xml extends AbstractWriter
 {
@@ -68,6 +57,7 @@ public function processConfig(array $config)
      * @param  array     $config
      * @param  XMLWriter $writer
      * @return void
+     * @throws Exception\RuntimeException
      */
     protected function addBranch($branchName, array $config, XMLWriter $writer)
     {
@@ -81,7 +71,7 @@ protected function addBranch($branchName, array $config, XMLWriter $writer)
                     $writer->startElement($branchName);
                     $branchType = 'string';
                 }
-            } else if ($branchType !== (is_numeric($key) ? 'numeric' : 'string')) {
+            } elseif ($branchType !== (is_numeric($key) ? 'numeric' : 'string')) {
                 throw new Exception\RuntimeException('Mixing of string and numeric keys is not allowed');
             }
 
diff --git a/src/Writer/Yaml.php b/src/Writer/Yaml.php
index 6a5c1a0..9d4c309 100644
--- a/src/Writer/Yaml.php
+++ b/src/Writer/Yaml.php
@@ -1,21 +1,11 @@
 <?php
 /**
- * Zend Framework
+ * Zend Framework (http://framework.zend.com/)
  *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Config
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @package   Zend_Config
  */
 
 namespace Zend\Config\Writer;
@@ -25,31 +15,33 @@
 /**
  * @category   Zend
  * @package    Zend_Config
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @subpackage Writer
  */
 class Yaml extends AbstractWriter
 {
     /**
-     * Yaml encoder callback
-     * 
+     * YAML encoder callback
+     *
      * @var callable
      */
     protected $yamlEncoder;
+
     /**
      * Constructor
-     * 
-     * @param callable $yamlDecoder 
+     *
+     * @param callable|string|null $yamlEncoder
      */
-    public function __construct($yamlEncoder=null) {
-        if (!empty($yamlEncoder)) {
+    public function __construct($yamlEncoder = null)
+    {
+        if ($yamlEncoder !== null) {
             $this->setYamlEncoder($yamlEncoder);
         } else {
-            if (function_exists('yaml_parse')) {
-                $this->setYamlEncoder('yaml_parse');
+            if (function_exists('yaml_emit')) {
+                $this->setYamlEncoder('yaml_emit');
             }
         }
     }
+
     /**
      * Get callback for decoding YAML
      *
@@ -59,11 +51,13 @@ public function getYamlEncoder()
     {
         return $this->yamlEncoder;
     }
+
     /**
      * Set callback for decoding YAML
      *
      * @param  callable $yamlEncoder the decoder to set
      * @return Yaml
+     * @throws Exception\InvalidArgumentException
      */
     public function setYamlEncoder($yamlEncoder)
     {
@@ -73,23 +67,25 @@ public function setYamlEncoder($yamlEncoder)
         $this->yamlEncoder = $yamlEncoder;
         return $this;
     }
+
     /**
      * processConfig(): defined by AbstractWriter.
      *
      * @param  array $config
      * @return string
+     * @throws Exception\RuntimeException
      */
     public function processConfig(array $config)
     {
         if (null === $this->getYamlEncoder()) {
              throw new Exception\RuntimeException("You didn't specify a Yaml callback encoder");
         }
-        
+
         $config = call_user_func($this->getYamlEncoder(), $config);
         if (null === $config) {
             throw new Exception\RuntimeException("Error generating YAML data");
         }
-        
+
         return $config;
     }
 }
diff --git a/test/ConfigTest.php b/test/ConfigTest.php
index c67efc2..25eac99 100644
--- a/test/ConfigTest.php
+++ b/test/ConfigTest.php
@@ -1,34 +1,21 @@
 <?php
 /**
- * Zend Framework
+ * Zend Framework (http://framework.zend.com/)
  *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Config
- * @subpackage UnitTests
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @package   Zend_Config
  */
 
 namespace ZendTest\Config;
 
-use \Zend\Config\Config;
+use Zend\Config\Config;
 
 /**
  * @category   Zend
  * @package    Zend_Config
  * @subpackage UnitTests
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @group      Zend_Config
  */
 class ConfigTest extends \PHPUnit_Framework_TestCase
@@ -473,20 +460,14 @@ public function testMergeHonoursAllowModificationsFlagAtAllLevels()
         $config2 = new Config(array(), true);
 
         $config2->merge($config);
-        try {
-            $config2->key2 = 'no';
-        }  catch (\Zend\Config\Exception\RuntimeException $e) {
-            $this->fail('Unexpected exception at top level has been raised: ' . $e->getMessage());
-        }
+
+        $config2->key2 = 'no';
+
         $this->assertEquals('no', $config2->key2);
 
-        try {
-            $config2->key->nested = 'no';
-        }  catch (\Zend\Config\Exception\RuntimeException $e) {
-            $this->fail('Unexpected exception on nested object has been raised: ' . $e->getMessage());
-        }
-        $this->assertEquals('no', $config2->key->nested);
+        $config2->key->nested = 'no';
 
+        $this->assertEquals('no', $config2->key->nested);
     }
 
     /**
@@ -502,8 +483,7 @@ public function testUnsettingFirstElementDuringForeachDoesNotSkipAnElement()
         ), true);
 
         $keyList = array();
-        foreach ($config as $key => $value)
-        {
+        foreach ($config as $key => $value) {
             $keyList[] = $key;
             if ($key == 'first') {
                 unset($config->$key); // uses magic Zend\Config\Config::__unset() method
@@ -528,8 +508,7 @@ public function testUnsettingAMiddleElementDuringForeachDoesNotSkipAnElement()
         ), true);
 
         $keyList = array();
-        foreach ($config as $key => $value)
-        {
+        foreach ($config as $key => $value) {
             $keyList[] = $key;
             if ($key == 'second') {
                 unset($config->$key); // uses magic Zend\Config\Config::__unset() method
@@ -554,8 +533,7 @@ public function testUnsettingLastElementDuringForeachDoesNotSkipAnElement()
         ), true);
 
         $keyList = array();
-        foreach ($config as $key => $value)
-        {
+        foreach ($config as $key => $value) {
             $keyList[] = $key;
             if ($key == 'third') {
                 unset($config->$key); // uses magic Zend\Config\Config::__unset() method
@@ -595,7 +573,8 @@ public function testZF6995_toArrayDoesNotDisturbInternalIterator()
      * @depends testMerge
      * @link http://framework.zend.com/issues/browse/ZF2-186
      */
-    public function testZF2_186_mergeReplacingUnnamedConfigSettings(){
+    public function testZF2_186_mergeReplacingUnnamedConfigSettings()
+    {
         $arrayA = array(
             'flag' => true,
             'text' => 'foo',
diff --git a/test/FactoryTest.php b/test/FactoryTest.php
index d7de536..ffd4836 100644
--- a/test/FactoryTest.php
+++ b/test/FactoryTest.php
@@ -1,91 +1,75 @@
 <?php
 /**
- * Zend Framework
+ * Zend Framework (http://framework.zend.com/)
  *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Config
- * @subpackage UnitTests
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @package   Zend_Config
  */
 
 namespace ZendTest\Config;
 
-use \Zend\Config\Factory;
+use Zend\Config\Factory;
 
 /**
  * @category   Zend
  * @package    Zend_Config
  * @subpackage UnitTests
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @group      Zend_Config
  */
 class FactoryTest extends \PHPUnit_Framework_TestCase
 {
-    protected $_iniFileConfig;
-    protected $_iniFileNested;
-
     public function testFromIni()
     {
         $config = Factory::fromFile(__DIR__ . '/TestAssets/Ini/include-base.ini');
-        
+
         $this->assertEquals('bar', $config['base']['foo']);
     }
-    
+
     public function testFromXml()
     {
         $config = Factory::fromFile(__DIR__ . '/TestAssets/Xml/include-base.xml');
-        
+
         $this->assertEquals('bar', $config['base']['foo']);
     }
-    
+
     public function testFromIniFiles()
     {
         $files = array (
             __DIR__ . '/TestAssets/Ini/include-base.ini',
             __DIR__ . '/TestAssets/Ini/include-base2.ini'
         );
-        
         $config = Factory::fromFiles($files);
+
         $this->assertEquals('bar', $config['base']['foo']);
         $this->assertEquals('baz', $config['test']['bar']);
     }
-    
+
     public function testFromXmlFiles()
     {
         $files = array (
             __DIR__ . '/TestAssets/Xml/include-base.xml',
             __DIR__ . '/TestAssets/Xml/include-base2.xml'
         );
-        
         $config = Factory::fromFiles($files);
+
         $this->assertEquals('bar', $config['base']['foo']);
         $this->assertEquals('baz', $config['test']['bar']);
     }
-    
+
     public function testFromPhpFiles()
     {
         $files = array (
             __DIR__ . '/TestAssets/Php/include-base.php',
             __DIR__ . '/TestAssets/Php/include-base2.php'
         );
-        
         $config = Factory::fromFiles($files);
+
         $this->assertEquals('bar', $config['base']['foo']);
         $this->assertEquals('baz', $config['test']['bar']);
     }
-    
+
     public function testFromIniAndXmlAndPhpFiles()
     {
         $files = array (
@@ -93,8 +77,8 @@ public function testFromIniAndXmlAndPhpFiles()
             __DIR__ . '/TestAssets/Xml/include-base2.xml',
             __DIR__ . '/TestAssets/Php/include-base3.php',
         );
-        
         $config = Factory::fromFiles($files);
+
         $this->assertEquals('bar', $config['base']['foo']);
         $this->assertEquals('baz', $config['test']['bar']);
         $this->assertEquals('baz', $config['last']['bar']);
@@ -105,7 +89,7 @@ public function testReturnsConfigObjectIfRequestedAndArrayOtherwise()
         $files = array (
             __DIR__ . '/TestAssets/Ini/include-base.ini',
         );
-        
+
         $configArray = Factory::fromFile($files[0]);
         $this->assertTrue(is_array($configArray));
 
@@ -125,10 +109,35 @@ public function testNonExistentFileThrowsRuntimeException()
         $config = Factory::fromFile('foo.bar');
     }
 
-    public function testInvalidFileExtensionThrowsInvalidArgumentException()
+    public function testUnsupportedFileExtensionThrowsRuntimeException()
     {
         $this->setExpectedException('RuntimeException');
         $config = Factory::fromFile(__DIR__ . '/TestAssets/bad.ext');
     }
+
+    public function testFactoryCanRegisterCustomReaderInstance()
+    {
+        Factory::registerReader('dum', new Reader\TestAssets\DummyReader());
+
+        $configObject = Factory::fromFile(__DIR__ . '/TestAssets/dummy.dum', true);
+        $this->assertInstanceOf('Zend\Config\Config', $configObject);
+
+        $this->assertEquals($configObject['one'], 1);
+    }
+
+    public function testFactoryCanRegisterCustomReaderPlugn()
+    {
+        $dummyReader = new Reader\TestAssets\DummyReader();
+        Factory::getReaderPluginManager()->setService('DummyReader',$dummyReader);
+
+        Factory::registerReader('dum', 'DummyReader');
+
+        $configObject = Factory::fromFile(__DIR__ . '/TestAssets/dummy.dum', true);
+        $this->assertInstanceOf('Zend\Config\Config', $configObject);
+
+        $this->assertEquals($configObject['one'], 1);
+    }
+
+
 }
 
diff --git a/test/ProcessorTest.php b/test/ProcessorTest.php
index 42cf335..aaeb368 100644
--- a/test/ProcessorTest.php
+++ b/test/ProcessorTest.php
@@ -1,51 +1,38 @@
 <?php
 /**
- * Zend Framework
+ * Zend Framework (http://framework.zend.com/)
  *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Config
- * @subpackage UnitTests
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @package   Zend_Config
  */
 
 namespace ZendTest\Config;
 
-use Zend\Config\Config,
-Zend\Config\Processor\Token as TokenProcessor,
-Zend\Config\Processor\Translator as TranslatorProcessor,
-Zend\Config\Processor\Filter as FilterProcessor,
-Zend\Config\Processor\Constant as ConstantProcessor,
-Zend\Config\Processor\Queue as Queue,
-Zend\Translator\Translator,
-Zend\Translator\Adapter\ArrayAdapter,
-Zend\Filter\StringToLower,
-Zend\Filter\StringToUpper,
-Zend\Filter\PregReplace;
+use Zend\Config\Config;
+use Zend\Config\Processor\Token as TokenProcessor;
+use Zend\Config\Processor\Translator as TranslatorProcessor;
+use Zend\Config\Processor\Filter as FilterProcessor;
+use Zend\Config\Processor\Constant as ConstantProcessor;
+use Zend\Config\Processor\Queue as Queue;
+use Zend\I18n\Translator\Translator;
+use Zend\I18n\Translator\Loader\PhpArray;
+use Zend\Filter\StringToLower;
+use Zend\Filter\StringToUpper;
+use Zend\Filter\PregReplace;
 
 /**
  * @category   Zend
  * @package    Zend_Config
  * @subpackage UnitTests
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @group      Zend_Config
  */
 class ProcessorTest extends \PHPUnit_Framework_TestCase
 {
     protected $nested;
     protected $tokenBare, $tokenPrefix, $tokenSuffix, $tokenSurround, $tokenSurroundMixed;
-    protected $translator, $translatorStrings;
+    protected $translatorData, $translatorFile;
     protected $userConstants, $phpConstants;
     protected $filter;
 
@@ -116,7 +103,7 @@ public function setUp()
             ),
         );
 
-        $this->translator = array(
+        $this->translatorData = array(
             'pages' => array(
                 array(
                     'id' => 'oneDog',
@@ -131,10 +118,7 @@ public function setUp()
             )
         );
 
-        $this->translatorStrings = array(
-            'one dog' => 'ein Hund',
-            'two dogs' => 'zwei Hunde'
-        );
+        $this->translatorFile = realpath(__DIR__ . '/_files/translations-de_DE.php');
 
         $this->filter = array(
             'simple' => 'some MixedCase VALue',
@@ -143,11 +127,6 @@ public function setUp()
             ),
         );
 
-        if (ArrayAdapter::hasCache()) {
-            ArrayAdapter::clearCache();
-            ArrayAdapter::removeCache();
-        }
-
         $this->userConstants = array(
             'simple' => 'SOME_USERLAND_CONSTANT',
             'inside' => 'some text with SOME_USERLAND_CONSTANT inside',
@@ -198,10 +177,11 @@ public function testBareTokenPost()
     public function testAddInvalidToken()
     {
         $processor = new TokenProcessor();
-        $this->setExpectedException('Zend\Config\Exception\InvalidArgumentException', 'Cannot use ' . gettype(array()) . ' as token name.');
+        $this->setExpectedException('Zend\Config\Exception\InvalidArgumentException',
+                                    'Cannot use ' . gettype(array()) . ' as token name.');
         $processor->addToken(array(), 'bar');
     }
-    
+
     public function testSingleValueToken()
     {
         $processor = new TokenProcessor();
@@ -210,17 +190,18 @@ public function testSingleValueToken()
         $out = $processor->processValue($data);
         $this->assertEquals($out, 'test');
     }
-    
+
     public function testTokenReadOnly()
     {
         $config = new Config($this->tokenBare, false);
         $processor = new TokenProcessor();
         $processor->addToken('BARETOKEN', 'some replaced value');
-        
-        $this->setExpectedException('Zend\Config\Exception\InvalidArgumentException', 'Cannot parse config because it is read-only');
+
+        $this->setExpectedException('Zend\Config\Exception\InvalidArgumentException',
+                                    'Cannot process config because it is read-only');
         $processor->process($config);
     }
-    
+
     public function testTokenPrefix()
     {
         $config = new Config($this->tokenPrefix, true);
@@ -306,7 +287,7 @@ public function testUserConstants()
         $this->assertTrue(is_array($tokens));
         $this->assertTrue(in_array('SOME_USERLAND_CONSTANT', $tokens));
         $this->assertTrue(!$processor->getUserOnly());
-        
+
         $this->assertEquals('some constant value', $config->simple);
         $this->assertEquals('some text with some constant value inside', $config->inside);
         $this->assertEquals('some constant value', $config->nested->simple);
@@ -324,17 +305,17 @@ public function testUserOnlyConstants()
         $processor->process($config);
 
         $tokens = $processor->getTokens();
-        
+
         $this->assertTrue(is_array($tokens));
         $this->assertTrue(in_array('SOME_USERLAND_CONSTANT', $tokens));
         $this->assertTrue($processor->getUserOnly());
-        
+
         $this->assertEquals('some constant value', $config->simple);
         $this->assertEquals('some text with some constant value inside', $config->inside);
         $this->assertEquals('some constant value', $config->nested->simple);
         $this->assertEquals('some text with some constant value inside', $config->nested->inside);
     }
-    
+
     /**
      * @depends testTokenSurround
      */
@@ -352,42 +333,45 @@ public function testPHPConstants()
 
     public function testTranslator()
     {
-        $config = new Config($this->translator, true);
-        $translator = new Translator(Translator::AN_ARRAY, $this->translatorStrings, 'de_DE');
-        $processor = new TranslatorProcessor($translator);
+        $config     = new Config($this->translatorData, true);
+        $translator = new Translator();
+        $translator->addTranslationFile('phparray', $this->translatorFile);
+        $processor  = new TranslatorProcessor($translator);
 
         $processor->process($config);
 
         $this->assertEquals('oneDog', $config->pages[0]->id);
         $this->assertEquals('ein Hund', $config->pages[0]->label);
-
         $this->assertEquals('twoDogs', $config->pages[1]->id);
         $this->assertEquals('zwei Hunde', $config->pages[1]->label);
     }
-    
+
     public function testTranslatorReadOnly()
     {
-        $config = new Config($this->translator, false);
-        $translator = new Translator(Translator::AN_ARRAY, $this->translatorStrings, 'de_DE');
-        $processor = new TranslatorProcessor($translator);
-        $this->setExpectedException('Zend\Config\Exception\InvalidArgumentException', 'Cannot parse config because it is read-only');
+        $config     = new Config($this->translatorData, false);
+        $translator = new Translator();
+        $processor  = new TranslatorProcessor($translator);
+
+        $this->setExpectedException('Zend\Config\Exception\InvalidArgumentException',
+                                    'Cannot process config because it is read-only');
         $processor->process($config);
     }
 
     public function testTranslatorSingleValue()
-    {        
-        $translator = new Translator(Translator::AN_ARRAY, $this->translatorStrings, 'de_DE');
-        $processor = new TranslatorProcessor($translator);
-        $word = 'one dog'; 
-        $this->assertEquals('ein Hund', $processor->processValue($word));
+    {
+        $translator = new Translator();
+        $translator->addTranslationFile('phparray', $this->translatorFile);
+        $processor  = new TranslatorProcessor($translator);
+
+        $this->assertEquals('ein Hund', $processor->processValue('one dog'));
     }
-    
+
     public function testFilter()
     {
         $config = new Config($this->filter, true);
         $filter = new StringToLower();
         $processor = new FilterProcessor($filter);
-        
+
         $this->assertTrue($processor->getFilter() instanceof StringToLower);
         $processor->process($config);
 
@@ -400,20 +384,21 @@ public function testFilterReadOnly()
         $config = new Config($this->filter, false);
         $filter = new StringToLower();
         $processor = new FilterProcessor($filter);
-        
-        $this->setExpectedException('Zend\Config\Exception\InvalidArgumentException', 'Cannot parse config because it is read-only');
+
+        $this->setExpectedException('Zend\Config\Exception\InvalidArgumentException',
+                                    'Cannot process config because it is read-only');
         $processor->process($config);
     }
-    
+
     public function testFilterValue()
     {
         $filter = new StringToLower();
         $processor = new FilterProcessor($filter);
-        
+
         $value = 'TEST';
         $this->assertEquals('test', $processor->processValue($value));
     }
-    
+
     /**
      * @depends testFilter
      */
@@ -436,7 +421,7 @@ public function testQueueFIFO()
         $this->assertEquals('some mixedcase value', $config->simple);
         $this->assertEquals('other mixed case value', $config->nested->simple);
     }
-    
+
     public function testQueueReadOnly()
     {
         $config = new Config($this->filter, false);
@@ -448,8 +433,9 @@ public function testQueueReadOnly()
          */
         $queue = new Queue();
         $queue->insert($lowerProcessor);
-        
-        $this->setExpectedException('Zend\Config\Exception\InvalidArgumentException', 'Cannot parse config because it is read-only');
+
+        $this->setExpectedException('Zend\Config\Exception\InvalidArgumentException',
+                                    'Cannot process config because it is read-only');
         $queue->process($config);
     }
 
@@ -466,11 +452,12 @@ public function testQueueSingleValue()
         $queue = new Queue();
         $queue->insert($upperProcessor);
         $queue->insert($lowerProcessor);
-        
+
         $data ='TeSt';
         $this->assertEquals('test', $queue->processValue($data));
-        
+
     }
+
     /**
      * @depends testQueueFIFO
      */
diff --git a/test/Reader/AbstractReaderTestCase.php b/test/Reader/AbstractReaderTestCase.php
index 1f4a99d..1e45a5c 100644
--- a/test/Reader/AbstractReaderTestCase.php
+++ b/test/Reader/AbstractReaderTestCase.php
@@ -1,36 +1,23 @@
 <?php
 /**
- * Zend Framework
+ * Zend Framework (http://framework.zend.com/)
  *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Config
- * @subpackage UnitTests
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @package   Zend_Config
  */
 
 namespace ZendTest\Config\Reader;
 
-use \PHPUnit_Framework_TestCase as TestCase,
-    \Zend\Config\Reader\ReaderInterface,
-    \ReflectionClass;
+use PHPUnit_Framework_TestCase as TestCase;
+use Zend\Config\Reader\ReaderInterface;
+use ReflectionClass;
 
 /**
  * @category   Zend
  * @package    Zend_Config
  * @subpackage UnitTests
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @group      Zend_Config
  */
 abstract class AbstractReaderTestCase extends TestCase
@@ -39,27 +26,28 @@ abstract class AbstractReaderTestCase extends TestCase
      * @var ReaderInterface
      */
     protected $reader;
-    
+
     /**
      * Get test asset name for current test case.
-     * 
+     *
+     * @param  string $name
      * @return string
      */
     abstract protected function getTestAssetPath($name);
-       
+
     public function testMissingFile()
     {
         $filename = $this->getTestAssetPath('no-file');
-        $this->setExpectedException('Zend\Config\Exception\RuntimeException', "The file $filename doesn't exists.");
-        $config = $this->reader->fromFile($filename); 
+        $this->setExpectedException('Zend\Config\Exception\RuntimeException', "doesn't exist or not readable");
+        $config = $this->reader->fromFile($filename);
     }
-    
+
     public function testFromFile()
     {
         $config = $this->reader->fromFile($this->getTestAssetPath('include-base'));
         $this->assertEquals('foo', $config['foo']);
     }
-    
+
     public function testFromEmptyString()
     {
         $config = $this->reader->fromString('');
diff --git a/test/Reader/IniTest.php b/test/Reader/IniTest.php
index 82b101e..f814218 100644
--- a/test/Reader/IniTest.php
+++ b/test/Reader/IniTest.php
@@ -1,34 +1,21 @@
 <?php
 /**
- * Zend Framework
+ * Zend Framework (http://framework.zend.com/)
  *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Config
- * @subpackage UnitTests
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @package   Zend_Config
  */
 
 namespace ZendTest\Config\Reader;
 
-use \Zend\Config\Reader\Ini;
+use Zend\Config\Reader\Ini;
 
 /**
  * @category   Zend
  * @package    Zend_Config
  * @subpackage UnitTests
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @group      Zend_Config
  */
 class IniTest extends AbstractReaderTestCase
@@ -37,10 +24,10 @@ public function setUp()
     {
         $this->reader = new Ini();
     }
-    
+
     /**
      * getTestAssetPath(): defined by AbstractReaderTestCase.
-     * 
+     *
      * @see    AbstractReaderTestCase::getTestAssetPath()
      * @return string
      */
@@ -48,14 +35,14 @@ protected function getTestAssetPath($name)
     {
         return __DIR__ . '/TestAssets/Ini/' . $name . '.ini';
     }
-    
+
     public function testInvalidIniFile()
     {
         $this->reader = new Ini();
         $this->setExpectedException('Zend\Config\Exception\RuntimeException');
         $arrayIni = $this->reader->fromFile($this->getTestAssetPath('invalid'));
     }
-    
+
     public function testFromString()
     {
         $ini = <<<ECS
@@ -64,13 +51,13 @@ public function testFromString()
 bar[]= "foo"
 
 ECS;
-        
+
         $arrayIni = $this->reader->fromString($ini);
         $this->assertEquals($arrayIni['test'], 'foo');
         $this->assertEquals($arrayIni['bar'][0], 'baz');
         $this->assertEquals($arrayIni['bar'][1], 'foo');
     }
-    
+
     public function testInvalidString()
     {
         $ini = <<<ECS
@@ -80,7 +67,7 @@ public function testInvalidString()
         $this->setExpectedException('Zend\Config\Exception\RuntimeException');
         $arrayIni = $this->reader->fromString($ini);
     }
-    
+
     public function testFromStringWithSection()
     {
         $ini = <<<ECS
@@ -90,7 +77,7 @@ public function testFromStringWithSection()
 bar[]= "foo"
 
 ECS;
-        
+
         $arrayIni = $this->reader->fromString($ini);
         $this->assertEquals($arrayIni['all']['test'], 'foo');
         $this->assertEquals($arrayIni['all']['bar'][0], 'baz');
diff --git a/test/Reader/JsonTest.php b/test/Reader/JsonTest.php
index b52bb2d..20cc681 100644
--- a/test/Reader/JsonTest.php
+++ b/test/Reader/JsonTest.php
@@ -1,34 +1,21 @@
 <?php
 /**
- * Zend Framework
+ * Zend Framework (http://framework.zend.com/)
  *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Config
- * @subpackage UnitTests
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @package   Zend_Config
  */
 
 namespace ZendTest\Config\Reader;
 
-use \Zend\Config\Reader\Json;
+use Zend\Config\Reader\Json;
 
 /**
  * @category   Zend
  * @package    Zend_Config
  * @subpackage UnitTests
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @group      Zend_Config
  */
 class JsonTest extends AbstractReaderTestCase
@@ -37,10 +24,10 @@ public function setUp()
     {
         $this->reader = new Json();
     }
-    
+
     /**
      * getTestAssetPath(): defined by AbstractReaderTestCase.
-     * 
+     *
      * @see    AbstractReaderTestCase::getTestAssetPath()
      * @return string
      */
@@ -48,36 +35,36 @@ protected function getTestAssetPath($name)
     {
         return __DIR__ . '/TestAssets/Json/' . $name . '.json';
     }
-    
+
     public function testInvalidJsonFile()
     {
         $this->setExpectedException('Zend\Config\Exception\RuntimeException');
         $arrayJson = $this->reader->fromFile($this->getTestAssetPath('invalid'));
     }
-    
+
     public function testIncludeAsElement()
     {
         $arrayJson = $this->reader->fromFile($this->getTestAssetPath('include-base_nested'));
         $this->assertEquals($arrayJson['bar']['foo'], 'foo');
     }
-    
+
     public function testFromString()
     {
         $json = '{ "test" : "foo", "bar" : [ "baz", "foo" ] }';
-        
+
         $arrayJson = $this->reader->fromString($json);
-        
+
         $this->assertEquals($arrayJson['test'], 'foo');
         $this->assertEquals($arrayJson['bar'][0], 'baz');
         $this->assertEquals($arrayJson['bar'][1], 'foo');
     }
-    
+
     public function testInvalidString()
     {
         $json = '{"foo":"bar"';
-        
+
         $this->setExpectedException('Zend\Config\Exception\RuntimeException');
         $arrayIni = $this->reader->fromString($json);
     }
-    
+
 }
diff --git a/test/Reader/TestAssets/DummyReader.php b/test/Reader/TestAssets/DummyReader.php
new file mode 100644
index 0000000..95d24d5
--- /dev/null
+++ b/test/Reader/TestAssets/DummyReader.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @package   Zend_Config
+ */
+
+namespace ZendTest\Config\Reader\TestAssets;
+
+use Zend\Config\Reader\ReaderInterface;
+use Zend\Config\Exception;
+
+class DummyReader implements ReaderInterface
+{
+    public function fromFile($filename)
+    {
+        if (!is_readable($filename)) {
+            throw new Exception\RuntimeException("File '{$filename}' doesn't exist or not readable");
+        }
+
+        return unserialize(file_get_contents($filename));
+    }
+
+    public function fromString($string)
+    {
+        if (empty($string)) {
+            return array();
+        }
+
+        return unserialize($string);
+    }
+}
diff --git a/test/Reader/TestAssets/Xml/array.xml b/test/Reader/TestAssets/Xml/array.xml
old mode 100755
new mode 100644
diff --git a/test/Reader/XmlTest.php b/test/Reader/XmlTest.php
index eb25359..9258a74 100644
--- a/test/Reader/XmlTest.php
+++ b/test/Reader/XmlTest.php
@@ -1,34 +1,21 @@
 <?php
 /**
- * Zend Framework
+ * Zend Framework (http://framework.zend.com/)
  *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Config
- * @subpackage UnitTests
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @package   Zend_Config
  */
 
 namespace ZendTest\Config\Reader;
 
-use \Zend\Config\Reader\Xml;
+use Zend\Config\Reader\Xml;
 
 /**
  * @category   Zend
  * @package    Zend_Config
  * @subpackage UnitTests
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @group      Zend_Config
  */
 class XmlTest extends AbstractReaderTestCase
@@ -37,10 +24,10 @@ public function setUp()
     {
         $this->reader = new Xml();
     }
-    
+
     /**
      * getTestAssetPath(): defined by AbstractReaderTestCase.
-     * 
+     *
      * @see    AbstractReaderTestCase::getTestAssetPath()
      * @return string
      */
@@ -48,14 +35,14 @@ protected function getTestAssetPath($name)
     {
         return __DIR__ . '/TestAssets/Xml/' . $name . '.xml';
     }
-    
+
     public function testInvalidXmlFile()
     {
         $this->reader = new Xml();
         $this->setExpectedException('Zend\Config\Exception\RuntimeException');
         $arrayXml = $this->reader->fromFile($this->getTestAssetPath('invalid'));
     }
-    
+
     public function testFromString()
     {
         $xml = <<<ECS
@@ -67,13 +54,13 @@ public function testFromString()
 </zend-config>
 
 ECS;
-        
+
         $arrayXml= $this->reader->fromString($xml);
         $this->assertEquals($arrayXml['test'], 'foo');
         $this->assertEquals($arrayXml['bar'][0], 'baz');
         $this->assertEquals($arrayXml['bar'][1], 'foo');
     }
-    
+
     public function testInvalidString()
     {
         $xml = <<<ECS
diff --git a/test/Reader/YamlTest.php b/test/Reader/YamlTest.php
index 33bd200..cf9be60 100644
--- a/test/Reader/YamlTest.php
+++ b/test/Reader/YamlTest.php
@@ -1,49 +1,36 @@
 <?php
 /**
- * Zend Framework
+ * Zend Framework (http://framework.zend.com/)
  *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Config
- * @subpackage UnitTests
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @package   Zend_Config
  */
 
 namespace ZendTest\Config\Reader;
 
-use \Zend\Config\Reader\Yaml as YamlReader;
+use Zend\Config\Reader\Yaml as YamlReader;
 
 /**
  * @category   Zend
  * @package    Zend_Config
  * @subpackage UnitTests
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @group      Zend_Config
  */
 class YamlTest extends AbstractReaderTestCase
 {
     public function setUp()
     {
-        
+
         if (!constant('TESTS_ZEND_CONFIG_YAML_ENABLED')) {
             $this->markTestSkipped('Yaml test for Zend\Config skipped');
         }
-        
+
         if (constant('TESTS_ZEND_CONFIG_YAML_LIB_INCLUDE')) {
             require_once constant('TESTS_ZEND_CONFIG_YAML_LIB_INCLUDE');
         }
-        
+
         $yamlReader = explode('::', constant('TESTS_ZEND_CONFIG_READER_YAML_CALLBACK'));
         if (isset($yamlReader[1])) {
             $this->reader = new YamlReader(array($yamlReader[0], $yamlReader[1]));
@@ -51,10 +38,10 @@ public function setUp()
             $this->reader = new YamlReader(array($yamlReader[0]));
         }
     }
-    
+
     /**
      * getTestAssetPath(): defined by AbstractReaderTestCase.
-     * 
+     *
      * @see    AbstractReaderTestCase::getTestAssetPath()
      * @return string
      */
@@ -62,13 +49,13 @@ protected function getTestAssetPath($name)
     {
         return __DIR__ . '/TestAssets/Yaml/' . $name . '.yaml';
     }
-    
+
     public function testInvalidIniFile()
     {
         $this->setExpectedException('Zend\Config\Exception\RuntimeException');
         $arrayIni = $this->reader->fromFile($this->getTestAssetPath('invalid'));
     }
-    
+
     public function testFromString()
     {
         $yaml = <<<ECS
@@ -78,13 +65,13 @@ public function testFromString()
     foo
 
 ECS;
-        
+
         $arrayYaml = $this->reader->fromString($yaml);
         $this->assertEquals($arrayYaml['test'], 'foo');
         $this->assertEquals($arrayYaml['bar'][0], 'baz');
         $this->assertEquals($arrayYaml['bar'][1], 'foo');
     }
-        
+
     public function testFromStringWithSection()
     {
         $yaml = <<<ECS
diff --git a/test/TestAssets/dummy.dum b/test/TestAssets/dummy.dum
new file mode 100644
index 0000000..3379326
--- /dev/null
+++ b/test/TestAssets/dummy.dum
@@ -0,0 +1 @@
+a:3:{s:3:"one";i:1;s:3:"two";i:2;s:5:"three";i:3;}
\ No newline at end of file
diff --git a/test/Writer/AbstractWriterTestCase.php b/test/Writer/AbstractWriterTestCase.php
index 3c1e91c..921a89b 100644
--- a/test/Writer/AbstractWriterTestCase.php
+++ b/test/Writer/AbstractWriterTestCase.php
@@ -1,59 +1,46 @@
 <?php
 /**
- * Zend Framework
+ * Zend Framework (http://framework.zend.com/)
  *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Config
- * @subpackage UnitTests
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @package   Zend_Config
  */
 
 namespace ZendTest\Config\Writer;
 
-use \PHPUnit_Framework_TestCase as TestCase,
-    \Zend\Config\Config;
+use PHPUnit_Framework_TestCase as TestCase;
+use Zend\Config\Config;
 
 /**
  * @category   Zend
  * @package    Zend_Config
  * @subpackage UnitTests
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @group      Zend_Config
  */
 abstract class AbstractWriterTestCase extends TestCase
 {
     /**
-     * @var ReaderInterface
+     * @var \Zend\Config\Reader\ReaderInterface
      */
     protected $reader;
-    
+
     /**
      *
-     * @var WriterInterface
+     * @var \Zend\Config\Writer\WriterInterface
      */
     protected $writer;
-    
+
     /**
      *
      * @var string
      */
     protected $tmpfile;
-    
+
     /**
      * Get test asset name for current test case.
-     * 
+     *
      * @return string
      */
     protected function getTestAssetFileName()
@@ -63,12 +50,17 @@ protected function getTestAssetFileName()
         }
         return $this->tmpfile;
     }
-       
+
     public function tearDown()
     {
-        @unlink($this->getTestAssetFileName());
+        if (file_exists($this->getTestAssetFileName())) {
+            if (!is_writable($this->getTestAssetFileName())) {
+                chmod($this->getTestAssetFileName(), 0777);
+            }
+            @unlink($this->getTestAssetFileName());
+        }
     }
-    
+
     public function testNoFilenameSet()
     {
         $this->setExpectedException('Zend\Config\Exception\InvalidArgumentException', 'No file name specified');
@@ -80,7 +72,7 @@ public function testFileNotValid()
         $this->setExpectedException('Zend\Config\Exception\RuntimeException');
         $this->writer->toFile('.', new Config(array()));
     }
-    
+
     public function testFileNotWritable()
     {
         $this->setExpectedException('Zend\Config\Exception\RuntimeException');
diff --git a/test/Writer/IniTest.php b/test/Writer/IniTest.php
index aa35b5a..287ad4d 100644
--- a/test/Writer/IniTest.php
+++ b/test/Writer/IniTest.php
@@ -1,49 +1,33 @@
 <?php
 /**
- * Zend Framework
+ * Zend Framework (http://framework.zend.com/)
  *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Config
- * @subpackage UnitTests
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @package   Zend_Config
  */
 
 namespace ZendTest\Config\Writer;
 
-use \Zend\Config\Writer\Ini as IniWriter,
-    \Zend\Config\Config,
-    \Zend\Config\Reader\Ini as IniReader;
+use Zend\Config\Writer\Ini as IniWriter;
+use Zend\Config\Config;
+use Zend\Config\Reader\Ini as IniReader;
 
 /**
  * @category   Zend
  * @package    Zend_Config
  * @subpackage UnitTests
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @group      Zend_Config
  */
 class IniTest extends AbstractWriterTestCase
 {
-
     public function setUp()
     {
         $this->reader = new IniReader();
         $this->writer = new IniWriter();
     }
 
-   
-
     public function testNoSection()
     {
         $config = new Config(array('test' => 'foo', 'test2' => array('test3' => 'bar')));
@@ -58,13 +42,12 @@ public function testNoSection()
 
     public function testWriteAndReadOriginalFile()
     {
-        $config = $this->reader->fromFile(__DIR__ . '/files/allsections.ini');
+        $config = $this->reader->fromFile(__DIR__ . '/_files/allsections.ini');
 
         $this->writer->toFile($this->getTestAssetFileName(), $config);
 
         $config = $this->reader->fromFile($this->getTestAssetFileName());
 
         $this->assertEquals('multi', $config['all']['one']['two']['three']);
-
     }
 }
diff --git a/test/Writer/JsonTest.php b/test/Writer/JsonTest.php
index ed89f00..a37ba6a 100644
--- a/test/Writer/JsonTest.php
+++ b/test/Writer/JsonTest.php
@@ -1,49 +1,33 @@
 <?php
 /**
- * Zend Framework
+ * Zend Framework (http://framework.zend.com/)
  *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Config
- * @subpackage UnitTests
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @package   Zend_Config
  */
 
 namespace ZendTest\Config\Writer;
 
-use \Zend\Config\Writer\Json as JsonWriter,
-    \Zend\Config\Config,
-    \Zend\Config\Reader\Json as JsonReader;
+use Zend\Config\Writer\Json as JsonWriter;
+use Zend\Config\Config;
+use Zend\Config\Reader\Json as JsonReader;
 
 /**
  * @category   Zend
  * @package    Zend_Config
  * @subpackage UnitTests
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @group      Zend_Config
  */
 class JsonTest extends AbstractWriterTestCase
 {
-
     public function setUp()
     {
         $this->reader = new JsonReader();
         $this->writer = new JsonWriter();
     }
 
-   
-
     public function testNoSection()
     {
         $config = new Config(array('test' => 'foo', 'test2' => array('test3' => 'bar')));
@@ -58,7 +42,7 @@ public function testNoSection()
 
     public function testWriteAndReadOriginalFile()
     {
-        $config = $this->reader->fromFile(__DIR__ . '/files/allsections.json');
+        $config = $this->reader->fromFile(__DIR__ . '/_files/allsections.json');
 
         $this->writer->toFile($this->getTestAssetFileName(), $config);
 
diff --git a/test/Writer/PhpArrayTest.php b/test/Writer/PhpArrayTest.php
index 5c9646b..2dae349 100644
--- a/test/Writer/PhpArrayTest.php
+++ b/test/Writer/PhpArrayTest.php
@@ -1,36 +1,23 @@
 <?php
 /**
- * Zend Framework
+ * Zend Framework (http://framework.zend.com/)
  *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Config
- * @subpackage UnitTests
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @package   Zend_Config
  */
 
 namespace ZendTest\Config\Writer;
 
-use \Zend\Config\Writer\PhpArray,
-    \Zend\Config\Config,
-    ZendTest\Config\Writer\files\PhpReader;
+use Zend\Config\Writer\PhpArray;
+use Zend\Config\Config;
+use ZendTest\Config\Writer\TestAssets\PhpReader;
 
 /**
  * @category   Zend
  * @package    Zend_Config
  * @subpackage UnitTests
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @group      Zend_Config
  */
 class PhpArrayTest extends AbstractWriterTestCase
@@ -49,7 +36,7 @@ public function setUp()
     public function testRender()
     {
         $config = new Config(array('test' => 'foo', 'bar' => array(0 => 'baz', 1 => 'foo')));
-        
+
         $configString = $this->writer->toString($config);
 
         // build string line by line as we are trailing-whitespace sensitive.
@@ -62,7 +49,7 @@ public function testRender()
         $expected .= "    1 => 'foo',\n";
         $expected .= "  ),\n";
         $expected .= ");\n";
-        
+
         $this->assertEquals($expected, $configString);
     }
 }
diff --git a/test/Writer/TestAssets/PhpReader.php b/test/Writer/TestAssets/PhpReader.php
new file mode 100644
index 0000000..909ff1e
--- /dev/null
+++ b/test/Writer/TestAssets/PhpReader.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @package   Zend_Config
+ */
+
+namespace ZendTest\Config\Writer\TestAssets;
+
+class PhpReader
+{
+    public function fromFile($filename)
+    {
+        return include $filename;
+    }
+}
diff --git a/test/Writer/XmlTest.php b/test/Writer/XmlTest.php
index ed3d15f..16f0c70 100644
--- a/test/Writer/XmlTest.php
+++ b/test/Writer/XmlTest.php
@@ -1,39 +1,26 @@
 <?php
 /**
- * Zend Framework
+ * Zend Framework (http://framework.zend.com/)
  *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Config
- * @subpackage UnitTests
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @package   Zend_Config
  */
 
 namespace ZendTest\Config\Writer;
 
-use \Zend\Config\Writer\Xml as XmlWriter,
-    \Zend\Config\Config,
-    \Zend\Config\Reader\Xml as XmlReader;
+use Zend\Config\Writer\Xml as XmlWriter;
+use Zend\Config\Config;
+use Zend\Config\Reader\Xml as XmlReader;
 
 /**
  * @category   Zend
  * @package    Zend_Config
  * @subpackage UnitTests
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @group      Zend_Config
  */
-class XmlTest extends \PHPUnit_Framework_TestCase
+class XmlTest extends AbstractWriterTestCase
 {
     protected $_tempName;
 
@@ -61,7 +48,7 @@ public function testToString()
 
         $this->assertEquals($expected, $configString);
     }
-    
+
     public function testSectionsToString()
     {
         $config = new Config(array(), true);
@@ -74,9 +61,9 @@ public function testSectionsToString()
         $config->production->database->params->username = 'production';
         $config->production->database->params->password = 'secret';
         $config->production->database->params->dbname = 'dbproduction';
-        
+
         $configString = $this->writer->toString($config);
-        
+
         $expected = <<<ECS
 <?xml version="1.0" encoding="UTF-8"?>
 <zend-config>
@@ -94,7 +81,7 @@ public function testSectionsToString()
 </zend-config>
 
 ECS;
-        
+
         $this->assertEquals($expected, $configString);
     }
 }
diff --git a/test/Writer/YamlTest.php b/test/Writer/YamlTest.php
index 73e9a40..d0d9db1 100644
--- a/test/Writer/YamlTest.php
+++ b/test/Writer/YamlTest.php
@@ -1,58 +1,44 @@
 <?php
 /**
- * Zend Framework
+ * Zend Framework (http://framework.zend.com/)
  *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Config
- * @subpackage UnitTests
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @package   Zend_Config
  */
 
 namespace ZendTest\Config\Writer;
 
-use \Zend\Config\Writer\Yaml as YamlWriter,
-    \Zend\Config\Config,
-    \Zend\Config\Reader\Yaml as YamlReader;
+use Zend\Config\Writer\Yaml as YamlWriter;
+use Zend\Config\Config;
+use Zend\Config\Reader\Yaml as YamlReader;
 
 /**
  * @category   Zend
  * @package    Zend_Config
  * @subpackage UnitTests
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @group      Zend_Config
  */
 class YamlTest extends AbstractWriterTestCase
 {
-
     public function setUp()
     {
         if (!constant('TESTS_ZEND_CONFIG_YAML_ENABLED')) {
             $this->markTestSkipped('Yaml test for Zend\Config skipped');
         }
-        
+
         if (constant('TESTS_ZEND_CONFIG_YAML_LIB_INCLUDE')) {
             require_once constant('TESTS_ZEND_CONFIG_YAML_LIB_INCLUDE');
         }
-        
+
         $yamlReader = explode('::', constant('TESTS_ZEND_CONFIG_READER_YAML_CALLBACK'));
         if (isset($yamlReader[1])) {
             $this->reader = new YamlReader(array($yamlReader[0], $yamlReader[1]));
         } else {
             $this->reader = new YamlReader(array($yamlReader[0]));
         }
-        
+
         $yamlWriter = explode('::', constant('TESTS_ZEND_CONFIG_WRITER_YAML_CALLBACK'));
         if (isset($yamlWriter[1])) {
             $this->writer = new YamlWriter(array($yamlWriter[0], $yamlWriter[1]));
@@ -75,7 +61,7 @@ public function testNoSection()
 
     public function testWriteAndReadOriginalFile()
     {
-        $config = $this->reader->fromFile(__DIR__ . '/files/allsections.yaml');
+        $config = $this->reader->fromFile(__DIR__ . '/_files/allsections.yaml');
 
         $this->writer->toFile($this->getTestAssetFileName(), $config);
 
diff --git a/test/Writer/files/allsections.ini b/test/Writer/_files/allsections.ini
similarity index 93%
rename from test/Writer/files/allsections.ini
rename to test/Writer/_files/allsections.ini
index d4eef2d..4eaa75b 100644
--- a/test/Writer/files/allsections.ini
+++ b/test/Writer/_files/allsections.ini
@@ -1,26 +1,26 @@
-[all]
-hostname = all
-name = thisname
-db.host = 127.0.0.1
-db.user = username
-db.pass = password
-db.name = live
-one.two.three = multi
-
-[staging]
-hostname = staging
-db.name = dbstaging
-debug = false
-
-[debug]
-hostname = debug
-debug = true
-values.changed = yes
-db.name = dbdebug
-special.no = no
-special.null = null
-special.false = false
-
-[other_staging]
-only_in = otherStaging
-db.pass = anotherpwd
+[all]
+hostname = all
+name = thisname
+db.host = 127.0.0.1
+db.user = username
+db.pass = password
+db.name = live
+one.two.three = multi
+
+[staging]
+hostname = staging
+db.name = dbstaging
+debug = false
+
+[debug]
+hostname = debug
+debug = true
+values.changed = yes
+db.name = dbdebug
+special.no = no
+special.null = null
+special.false = false
+
+[other_staging]
+only_in = otherStaging
+db.pass = anotherpwd
diff --git a/test/Writer/files/allsections.json b/test/Writer/_files/allsections.json
similarity index 100%
rename from test/Writer/files/allsections.json
rename to test/Writer/_files/allsections.json
diff --git a/test/Writer/files/allsections.xml b/test/Writer/_files/allsections.xml
similarity index 100%
rename from test/Writer/files/allsections.xml
rename to test/Writer/_files/allsections.xml
diff --git a/test/Writer/files/allsections.yaml b/test/Writer/_files/allsections.yaml
similarity index 100%
rename from test/Writer/files/allsections.yaml
rename to test/Writer/_files/allsections.yaml
diff --git a/test/Writer/files/PhpReader.php b/test/Writer/files/PhpReader.php
deleted file mode 100644
index d7e91fe..0000000
--- a/test/Writer/files/PhpReader.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-namespace ZendTest\Config\Writer\files;
-
-class PhpReader {
-    public function fromFile($filename) {
-        return include $filename;
-    }
-}
diff --git a/test/_files/translations-de_DE.php b/test/_files/translations-de_DE.php
new file mode 100644
index 0000000..5f42e0b
--- /dev/null
+++ b/test/_files/translations-de_DE.php
@@ -0,0 +1,5 @@
+<?php
+return array(
+    'one dog' => 'ein Hund',
+    'two dogs' => 'zwei Hunde'
+);