diff --git a/.coveralls.yml b/.coveralls.yml
new file mode 100644
index 0000000..53bda82
--- /dev/null
+++ b/.coveralls.yml
@@ -0,0 +1,3 @@
+coverage_clover: clover.xml
+json_path: coveralls-upload.json
+src_dir: src
diff --git a/.travis.yml b/.travis.yml
index 00340d8..26b4e88 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,25 +1,39 @@
+sudo: false
+
 language: php
 
-php:
-  - 5.3
-  - 5.4
-  - 5.5
-  - 5.6
-  - hhvm
+cache:
+  directories:
+    - $HOME/.composer/cache
+    - vendor
 
 matrix:
-  allow_failures:
+  fast_finish: true
+  include:
+    - php: 5.5
+      env:
+        - EXECUTE_CS_CHECK=true
+    - php: 5.6
+      env:
+        - EXECUTE_TEST_COVERALLS=true
+    - php: 7
     - php: hhvm
 
-before_script:
+before_install:
+  - if [[ $EXECUTE_TEST_COVERALLS != 'true' ]]; then phpenv config-rm xdebug.ini || return 0 ; fi
   - composer self-update
-  - composer install --dev --prefer-source
+  - if [[ $EXECUTE_TEST_COVERALLS == 'true' ]]; then composer require --no-update satooshi/php-coveralls:dev-master ; fi
+
+install:
+  - travis_retry composer install --no-interaction --ignore-platform-reqs --prefer-source
+  - composer info -i
 
 script:
-  - ./vendor/bin/phpunit
-  - ./vendor/bin/phpcs --standard=PSR2 ./src/ ./test
+  - if [[ $EXECUTE_TEST_COVERALLS == 'true' ]]; then ./vendor/bin/phpunit ; fi
+  - if [[ $EXECUTE_TEST_COVERALLS != 'true' ]]; then ./vendor/bin/phpunit --no-coverage ; fi
+  - if [[ $EXECUTE_CS_CHECK == 'true' ]]; then ./vendor/bin/phpcs --standard=PSR2 ./src/ ./test ; fi
 
 after_script:
-  - php vendor/bin/coveralls -v
+  - if [[ $EXECUTE_TEST_COVERALLS == 'true' ]]; then ./vendor/bin/coveralls ; fi
   - wget https://scrutinizer-ci.com/ocular.phar
-  - php ocular.phar code-coverage:upload --format=php-clover build/logs/clover.xml
+  - if [[ $EXECUTE_TEST_COVERALLS == 'true' ]]; then php ocular.phar code-coverage:upload --format=php-clover build/logs/clover.xml ; fi
diff --git a/CHANGELOG.md b/CHANGELOG.md
index ff202d7..b65522b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # BlockchainWalletApi CHANGELOG
 
+## Version 2.0.0 TBA
+
+* Uses module config cache now, removed module feature providers
+
 ## Version 1.0.0 - (2014-07-01)
 
 * Satoshi view helper which converts satoshi to other unit e.g. bitcoin
diff --git a/README.md b/README.md
index 01c3129..58d4a8a 100644
--- a/README.md
+++ b/README.md
@@ -12,6 +12,7 @@
 [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/sandrokeil/BlockchainWalletApi/badges/quality-score.png?s=e0089b63bdd99801480a5c7aedbda372767990ab)](https://scrutinizer-ci.com/g/sandrokeil/BlockchainWalletApi/)
 [![Coverage Status](https://coveralls.io/repos/sandrokeil/BlockchainWalletApi/badge.png)](https://coveralls.io/r/sandrokeil/BlockchainWalletApi)
 [![HHVM Status](http://hhvm.h4cc.de/badge/sandrokeil/blockchain-wallet-api.svg)](http://hhvm.h4cc.de/package/sandrokeil/blockchain-wallet-api)
+[![PHP 7 ready](http://php7ready.timesplinter.ch/sandrokeil/BlockchainWalletApi/badge.svg)](https://travis-ci.org/sandrokeil/BlockchainWalletApi)
 [![SensioLabsInsight](https://insight.sensiolabs.com/projects/eb0ea220-d358-431e-8862-1e85c84ad06a/mini.png)](https://insight.sensiolabs.com/projects/eb0ea220-d358-431e-8862-1e85c84ad06a)
 [![Latest Stable Version](https://poser.pugx.org/sandrokeil/blockchain-wallet-api/v/stable.png)](https://packagist.org/packages/sandrokeil/blockchain-wallet-api)
 [![Dependency Status](https://www.versioneye.com/user/projects/53615c9cfe0d07b45c000082/badge.svg)](https://www.versioneye.com/user/projects/53615c9cfe0d07b45c000082)
@@ -35,7 +36,7 @@ Put the following into your composer.json
 
     {
         "require": {
-            "sandrokeil/blockchain-wallet-api": "~1.0"
+            "sandrokeil/blockchain-wallet-api": "~2.0"
         }
     }
 
diff --git a/composer.json b/composer.json
index ff8091a..9569f6e 100644
--- a/composer.json
+++ b/composer.json
@@ -1,49 +1,81 @@
 {
-    "name": "sandrokeil/blockchain-wallet-api",
-    "description": "Zend Framework 2 (ZF2) client library for blockchain wallet api. Configure request, call the service and access the response data via objects.",
-    "homepage": "https://github.com/sandrokeil/BlockchainWalletApi",
-    "license": "BSD-3-Clause",
-    "type": "library",
-    "keywords": [
-        "blockchain",
-        "bitcoin",
-        "zf2",
-        "blockchain wallet api",
-        "wallet",
-        "api",
-        "webservice",
-        "client",
-        "payment"
-    ],
-    "authors": [
-        {"name": "Sandro Keil", "homepage": "https://github.com/sandrokeil"}
-    ],
-    "autoload": {
-        "psr-4": {
-            "Sake\\BlockchainWalletApi\\": "src/",
-            "SakeTest\\BlockchainWalletApi\\": "test/"
-        }
-    },
-    "require": {
-        "php": "~5.3",
-        "zendframework/zend-servicemanager": "~2.2",
-        "zendframework/zend-stdlib": "~2.2",
-        "zendframework/zend-http": "~2.2",
-        "zendframework/zend-filter": "~2.2",
-        "sandrokeil/easy-config": "~1.0"
-    },
-    "require-dev": {
-        "zendframework/zend-test": "~2.2",
-        "zendframework/zend-config": "~2.2",
-        "zendframework/zend-form": "~2.2",
-        "zendframework/zend-serializer": "~2.2",
-        "zendframework/zend-log": "~2.2",
-        "zendframework/zend-modulemanager": "~2.2",
-        "zendframework/zend-view": "~2.2",
-        "sandrokeil/citools": "~1.0"
-    },
-    "suggest": {
-        "zendframework/zend-view": "Zend\\View to use satoshi view helper",
-        "zendframework/zend-modulemanager": "Zend\\ModuleManager to use default module configuration e.g. services"
+  "name": "sandrokeil/blockchain-wallet-api",
+  "description": "Zend Framework 2 (ZF2) client library for blockchain wallet api. Configure request, call the service and access the response data via objects.",
+  "homepage": "https://github.com/sandrokeil/BlockchainWalletApi",
+  "license": "BSD-3-Clause",
+  "type": "library",
+  "keywords": [
+    "blockchain",
+    "bitcoin",
+    "zf2",
+    "blockchain wallet api",
+    "wallet",
+    "api",
+    "webservice",
+    "client",
+    "payment"
+  ],
+  "authors": [
+    {
+      "name": "Sandro Keil",
+      "homepage": "https://sandro-keil.de"
     }
+  ],
+  "support": {
+    "issues": "https://github.com/sandrokeil/BlockchainWalletApi/issues",
+    "source": "https://github.com/sandrokeil/BlockchainWalletApi",
+    "docs": "https://github.com/sandrokeil/BlockchainWalletApi"
+  },
+  "repositories": [
+    {
+      "type": "composer",
+      "url": "https://packages.zendframework.com/"
+    }
+  ],
+  "autoload": {
+    "psr-4": {
+      "Sake\\BlockchainWalletApi\\": "src/"
+    }
+  },
+  "autoload-dev": {
+    "psr-4": {
+      "SakeTest\\BlockchainWalletApi\\": "test/"
+    }
+  },
+  "require": {
+    "php": "~5.5",
+    "sandrokeil/easy-config": "~1.3",
+    "zendframework/zend-http": "~2.5",
+    "zendframework/zend-inputfilter": "~2.5",
+    "zendframework/zend-servicemanager": "~2.6",
+    "zendframework/zend-stdlib": "~2.6"
+  },
+  "require-dev": {
+    "phpunit/phpunit": "~4.8",
+    "phpunit/php-invoker": "~1.1",
+    "squizlabs/php_codesniffer": "~2.3",
+    "sebastian/peek-and-poke": "1.0.x-dev",
+    "zendframework/zend-view": "~2.5"
+  },
+  "suggest": {
+    "zendframework/zend-view": "Zend\\View to use satoshi view helper",
+    "zendframework/zend-modulemanager": "Zend\\ModuleManager to use default module configuration e.g. services"
+  },
+  "minimum-stability": "dev",
+  "prefer-stable": true,
+  "extra": {
+    "branch-alias": {
+      "dev-master": "2.0-dev",
+      "dev-develop": "2.1-dev"
+    }
+  },
+  "archive": {
+    "exclude": [
+      "test",
+      "phpunit.xml*",
+      ".travis.yml",
+      ".scrutinizer.yml",
+      ".coveralls.yml"
+    ]
+  }
 }
diff --git a/config/module.config.php b/config/module.config.php
new file mode 100644
index 0000000..de5c1e9
--- /dev/null
+++ b/config/module.config.php
@@ -0,0 +1,13 @@
+<?php
+/**
+ * Sake
+ *
+ * @link      http://github.com/sandrokeil/BlockchainWalletApi for the canonical source repository
+ * @copyright Copyright (c) 2014 - 2015 Sandro Keil
+ * @license   http://github.com/sandrokeil/BlockchainWalletApi/blob/master/LICENSE.txt New BSD License
+ */
+
+return array(
+    'service_manager' => require __DIR__ . '/service_manager.config.php',
+    'view_helper' => require __DIR__ . '/view_helper.config.php',
+);
diff --git a/config/service_manager.config.php b/config/service_manager.config.php
index dfcb631..f68f358 100644
--- a/config/service_manager.config.php
+++ b/config/service_manager.config.php
@@ -3,7 +3,7 @@
  * Sake
  *
  * @link      http://github.com/sandrokeil/BlockchainWalletApi for the canonical source repository
- * @copyright Copyright (c) 2014 Sandro Keil
+ * @copyright Copyright (c) 2014 - 2015 Sandro Keil
  * @license   http://github.com/sandrokeil/BlockchainWalletApi/blob/master/LICENSE.txt New BSD License
  */
 
diff --git a/config/view_helper.config.php b/config/view_helper.config.php
index fe06a31..134bc34 100644
--- a/config/view_helper.config.php
+++ b/config/view_helper.config.php
@@ -3,7 +3,7 @@
  * Sake
  *
  * @link      http://github.com/sandrokeil/BlockchainWalletApi for the canonical source repository
- * @copyright Copyright (c) 2014 Sandro Keil
+ * @copyright Copyright (c) 2014 - 2015 Sandro Keil
  * @license   http://github.com/sandrokeil/BlockchainWalletApi/blob/master/LICENSE.txt New BSD License
  */
 
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index c6245a1..31fcdf1 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -2,7 +2,6 @@
 <!-- disable strict to debug tests -->
 <phpunit bootstrap="./test/Bootstrap.php"
          colors="true"
-         strict="true"
          convertErrorsToExceptions="true"
          convertNoticesToExceptions="true"
          convertWarningsToExceptions="true"
diff --git a/src/Exception/ExceptionInterface.php b/src/Exception/ExceptionInterface.php
index 7b7a086..70a8c69 100644
--- a/src/Exception/ExceptionInterface.php
+++ b/src/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
  * Sake
  *
  * @link      http://github.com/sandrokeil/BlockchainWalletApi for the canonical source repository
- * @copyright Copyright (c) 2014 Sandro Keil
+ * @copyright Copyright (c) 2014 - 2015 Sandro Keil
  * @license   http://github.com/sandrokeil/BlockchainWalletApi/blob/master/LICENSE.txt New BSD License
  */
 
diff --git a/src/Exception/RuntimeException.php b/src/Exception/RuntimeException.php
index 274e85d..345f02e 100644
--- a/src/Exception/RuntimeException.php
+++ b/src/Exception/RuntimeException.php
@@ -3,7 +3,7 @@
  * Sake
  *
  * @link      http://github.com/sandrokeil/BlockchainWalletApi for the canonical source repository
- * @copyright Copyright (c) 2014 Sandro Keil
+ * @copyright Copyright (c) 2014 - 2015 Sandro Keil
  * @license   http://github.com/sandrokeil/BlockchainWalletApi/blob/master/LICENSE.txt New BSD License
  */
 
diff --git a/src/Hydrator/AddressListStrategy.php b/src/Hydrator/AddressListStrategy.php
index 820ff6e..1715019 100644
--- a/src/Hydrator/AddressListStrategy.php
+++ b/src/Hydrator/AddressListStrategy.php
@@ -3,7 +3,7 @@
  * Sake
  *
  * @link      http://github.com/sandrokeil/BlockchainWalletApi for the canonical source repository
- * @copyright Copyright (c) 2014 Sandro Keil
+ * @copyright Copyright (c) 2014 - 2015 Sandro Keil
  * @license   http://github.com/sandrokeil/BlockchainWalletApi/blob/master/LICENSE.txt New BSD License
  */
 
diff --git a/src/Hydrator/AddressStrategy.php b/src/Hydrator/AddressStrategy.php
index 8b9c32a..c052571 100644
--- a/src/Hydrator/AddressStrategy.php
+++ b/src/Hydrator/AddressStrategy.php
@@ -3,7 +3,7 @@
  * Sake
  *
  * @link      http://github.com/sandrokeil/BlockchainWalletApi for the canonical source repository
- * @copyright Copyright (c) 2014 Sandro Keil
+ * @copyright Copyright (c) 2014 - 2015 Sandro Keil
  * @license   http://github.com/sandrokeil/BlockchainWalletApi/blob/master/LICENSE.txt New BSD License
  */
 
diff --git a/src/Module.php b/src/Module.php
index 7e50a23..55a444a 100644
--- a/src/Module.php
+++ b/src/Module.php
@@ -3,39 +3,24 @@
  * Sake
  *
  * @link      http://github.com/sandrokeil/BlockchainWalletApi for the canonical source repository
- * @copyright Copyright (c) 2014 Sandro Keil
+ * @copyright Copyright (c) 2014 - 2015 Sandro Keil
  * @license   http://github.com/sandrokeil/BlockchainWalletApi/blob/master/LICENSE.txt New BSD License
  */
 
 namespace Sake\BlockchainWalletApi;
 
-use Zend\ModuleManager\Feature\ServiceProviderInterface;
-use Zend\ModuleManager\Feature\ViewHelperProviderInterface;
-
 /**
  * This class initializes the BlockchainWalletApi module.
  */
-class Module implements ServiceProviderInterface, ViewHelperProviderInterface
+class Module
 {
     /**
-     * Return service config
-     *
-     * @see ServiceProviderInterface::getServiceConfig()
-     * @return array
-     */
-    public function getServiceConfig()
-    {
-        return require dirname(__DIR__) . '/config/service_manager.config.php';
-    }
-
-    /**
-     * Expected to return \Zend\ServiceManager\Config object or array to
-     * seed such an object.
+     * Return module config e.g. service manager, view helper
      *
      * @return array
      */
-    public function getViewHelperConfig()
+    public function getConfig()
     {
-        return require dirname(__DIR__) . '/config/view_helper.config.php';
+        return require dirname(__DIR__) . '/config/module.config.php';
     }
 }
diff --git a/src/Request/AddressArchive.php b/src/Request/AddressArchive.php
index 85fe9e3..e345cb6 100644
--- a/src/Request/AddressArchive.php
+++ b/src/Request/AddressArchive.php
@@ -3,7 +3,7 @@
  * Sake
  *
  * @link      http://github.com/sandrokeil/BlockchainWalletApi for the canonical source repository
- * @copyright Copyright (c) 2014 Sandro Keil
+ * @copyright Copyright (c) 2014 - 2015 Sandro Keil
  * @license   http://github.com/sandrokeil/BlockchainWalletApi/blob/master/LICENSE.txt New BSD License
  */
 
diff --git a/src/Request/AddressBalance.php b/src/Request/AddressBalance.php
index ccb9f47..77aac5d 100644
--- a/src/Request/AddressBalance.php
+++ b/src/Request/AddressBalance.php
@@ -3,7 +3,7 @@
  * Sake
  *
  * @link      http://github.com/sandrokeil/BlockchainWalletApi for the canonical source repository
- * @copyright Copyright (c) 2014 Sandro Keil
+ * @copyright Copyright (c) 2014 - 2015 Sandro Keil
  * @license   http://github.com/sandrokeil/BlockchainWalletApi/blob/master/LICENSE.txt New BSD License
  */
 
diff --git a/src/Request/AddressUnarchive.php b/src/Request/AddressUnarchive.php
index ec24669..a833f89 100644
--- a/src/Request/AddressUnarchive.php
+++ b/src/Request/AddressUnarchive.php
@@ -3,7 +3,7 @@
  * Sake
  *
  * @link      http://github.com/sandrokeil/BlockchainWalletApi for the canonical source repository
- * @copyright Copyright (c) 2014 Sandro Keil
+ * @copyright Copyright (c) 2014 - 2015 Sandro Keil
  * @license   http://github.com/sandrokeil/BlockchainWalletApi/blob/master/LICENSE.txt New BSD License
  */
 
diff --git a/src/Request/AutoConsolidateAddresses.php b/src/Request/AutoConsolidateAddresses.php
index 41d4a90..2b69bd7 100644
--- a/src/Request/AutoConsolidateAddresses.php
+++ b/src/Request/AutoConsolidateAddresses.php
@@ -3,7 +3,7 @@
  * Sake
  *
  * @link      http://github.com/sandrokeil/BlockchainWalletApi for the canonical source repository
- * @copyright Copyright (c) 2014 Sandro Keil
+ * @copyright Copyright (c) 2014 - 2015 Sandro Keil
  * @license   http://github.com/sandrokeil/BlockchainWalletApi/blob/master/LICENSE.txt New BSD License
  */
 
diff --git a/src/Request/ListAddresses.php b/src/Request/ListAddresses.php
index 7f55b7c..994b5a6 100644
--- a/src/Request/ListAddresses.php
+++ b/src/Request/ListAddresses.php
@@ -3,7 +3,7 @@
  * Sake
  *
  * @link      http://github.com/sandrokeil/BlockchainWalletApi for the canonical source repository
- * @copyright Copyright (c) 2014 Sandro Keil
+ * @copyright Copyright (c) 2014 - 2015 Sandro Keil
  * @license   http://github.com/sandrokeil/BlockchainWalletApi/blob/master/LICENSE.txt New BSD License
  */
 
diff --git a/src/Request/NewAddress.php b/src/Request/NewAddress.php
index f4c55c4..0efe418 100644
--- a/src/Request/NewAddress.php
+++ b/src/Request/NewAddress.php
@@ -3,7 +3,7 @@
  * Sake
  *
  * @link      http://github.com/sandrokeil/BlockchainWalletApi for the canonical source repository
- * @copyright Copyright (c) 2014 Sandro Keil
+ * @copyright Copyright (c) 2014 - 2015 Sandro Keil
  * @license   http://github.com/sandrokeil/BlockchainWalletApi/blob/master/LICENSE.txt New BSD License
  */
 
diff --git a/src/Request/Recipient.php b/src/Request/Recipient.php
index 3bcccc4..9b640c7 100644
--- a/src/Request/Recipient.php
+++ b/src/Request/Recipient.php
@@ -3,7 +3,7 @@
  * Sake
  *
  * @link      http://github.com/sandrokeil/BlockchainWalletApi for the canonical source repository
- * @copyright Copyright (c) 2014 Sandro Keil
+ * @copyright Copyright (c) 2014 - 2015 Sandro Keil
  * @license   http://github.com/sandrokeil/BlockchainWalletApi/blob/master/LICENSE.txt New BSD License
  */
 
diff --git a/src/Request/RequestInterface.php b/src/Request/RequestInterface.php
index 359f3a9..ccc752e 100644
--- a/src/Request/RequestInterface.php
+++ b/src/Request/RequestInterface.php
@@ -3,7 +3,7 @@
  * Sake
  *
  * @link      http://github.com/sandrokeil/BlockchainWalletApi for the canonical source repository
- * @copyright Copyright (c) 2014 Sandro Keil
+ * @copyright Copyright (c) 2014 - 2015 Sandro Keil
  * @license   http://github.com/sandrokeil/BlockchainWalletApi/blob/master/LICENSE.txt New BSD License
  */
 
diff --git a/src/Request/Send.php b/src/Request/Send.php
index 3b83901..5efe550 100644
--- a/src/Request/Send.php
+++ b/src/Request/Send.php
@@ -3,7 +3,7 @@
  * Sake
  *
  * @link      http://github.com/sandrokeil/BlockchainWalletApi for the canonical source repository
- * @copyright Copyright (c) 2014 Sandro Keil
+ * @copyright Copyright (c) 2014 - 2015 Sandro Keil
  * @license   http://github.com/sandrokeil/BlockchainWalletApi/blob/master/LICENSE.txt New BSD License
  */
 
diff --git a/src/Request/SendMany.php b/src/Request/SendMany.php
index cf9449c..fb1ef90 100644
--- a/src/Request/SendMany.php
+++ b/src/Request/SendMany.php
@@ -3,7 +3,7 @@
  * Sake
  *
  * @link      http://github.com/sandrokeil/BlockchainWalletApi for the canonical source repository
- * @copyright Copyright (c) 2014 Sandro Keil
+ * @copyright Copyright (c) 2014 - 2015 Sandro Keil
  * @license   http://github.com/sandrokeil/BlockchainWalletApi/blob/master/LICENSE.txt New BSD License
  */
 
diff --git a/src/Request/WalletBalance.php b/src/Request/WalletBalance.php
index 9c1080a..35cc16b 100644
--- a/src/Request/WalletBalance.php
+++ b/src/Request/WalletBalance.php
@@ -3,7 +3,7 @@
  * Sake
  *
  * @link      http://github.com/sandrokeil/BlockchainWalletApi for the canonical source repository
- * @copyright Copyright (c) 2014 Sandro Keil
+ * @copyright Copyright (c) 2014 - 2015 Sandro Keil
  * @license   http://github.com/sandrokeil/BlockchainWalletApi/blob/master/LICENSE.txt New BSD License
  */
 
diff --git a/src/Response/Address.php b/src/Response/Address.php
index a9057af..7380cb6 100644
--- a/src/Response/Address.php
+++ b/src/Response/Address.php
@@ -3,7 +3,7 @@
  * Sake
  *
  * @link      http://github.com/sandrokeil/BlockchainWalletApi for the canonical source repository
- * @copyright Copyright (c) 2014 Sandro Keil
+ * @copyright Copyright (c) 2014 - 2015 Sandro Keil
  * @license   http://github.com/sandrokeil/BlockchainWalletApi/blob/master/LICENSE.txt New BSD License
  */
 
diff --git a/src/Response/AddressArchive.php b/src/Response/AddressArchive.php
index 66e1aa2..54d4938 100644
--- a/src/Response/AddressArchive.php
+++ b/src/Response/AddressArchive.php
@@ -3,7 +3,7 @@
  * Sake
  *
  * @link      http://github.com/sandrokeil/BlockchainWalletApi for the canonical source repository
- * @copyright Copyright (c) 2014 Sandro Keil
+ * @copyright Copyright (c) 2014 - 2015 Sandro Keil
  * @license   http://github.com/sandrokeil/BlockchainWalletApi/blob/master/LICENSE.txt New BSD License
  */
 
diff --git a/src/Response/AddressBalance.php b/src/Response/AddressBalance.php
index 679ebc4..11bf578 100644
--- a/src/Response/AddressBalance.php
+++ b/src/Response/AddressBalance.php
@@ -3,7 +3,7 @@
  * Sake
  *
  * @link      http://github.com/sandrokeil/BlockchainWalletApi for the canonical source repository
- * @copyright Copyright (c) 2014 Sandro Keil
+ * @copyright Copyright (c) 2014 - 2015 Sandro Keil
  * @license   http://github.com/sandrokeil/BlockchainWalletApi/blob/master/LICENSE.txt New BSD License
  */
 
diff --git a/src/Response/AddressUnarchive.php b/src/Response/AddressUnarchive.php
index e75824a..2b0baff 100644
--- a/src/Response/AddressUnarchive.php
+++ b/src/Response/AddressUnarchive.php
@@ -3,7 +3,7 @@
  * Sake
  *
  * @link      http://github.com/sandrokeil/BlockchainWalletApi for the canonical source repository
- * @copyright Copyright (c) 2014 Sandro Keil
+ * @copyright Copyright (c) 2014 - 2015 Sandro Keil
  * @license   http://github.com/sandrokeil/BlockchainWalletApi/blob/master/LICENSE.txt New BSD License
  */
 
diff --git a/src/Response/AutoConsolidateAddresses.php b/src/Response/AutoConsolidateAddresses.php
index 84d752b..ee6b460 100644
--- a/src/Response/AutoConsolidateAddresses.php
+++ b/src/Response/AutoConsolidateAddresses.php
@@ -3,7 +3,7 @@
  * Sake
  *
  * @link      http://github.com/sandrokeil/BlockchainWalletApi for the canonical source repository
- * @copyright Copyright (c) 2014 Sandro Keil
+ * @copyright Copyright (c) 2014 - 2015 Sandro Keil
  * @license   http://github.com/sandrokeil/BlockchainWalletApi/blob/master/LICENSE.txt New BSD License
  */
 
diff --git a/src/Response/ListAddresses.php b/src/Response/ListAddresses.php
index 1e6d388..c5bf5e8 100644
--- a/src/Response/ListAddresses.php
+++ b/src/Response/ListAddresses.php
@@ -3,7 +3,7 @@
  * Sake
  *
  * @link      http://github.com/sandrokeil/BlockchainWalletApi for the canonical source repository
- * @copyright Copyright (c) 2014 Sandro Keil
+ * @copyright Copyright (c) 2014 - 2015 Sandro Keil
  * @license   http://github.com/sandrokeil/BlockchainWalletApi/blob/master/LICENSE.txt New BSD License
  */
 
diff --git a/src/Response/NewAddress.php b/src/Response/NewAddress.php
index 110eef3..e43c0aa 100644
--- a/src/Response/NewAddress.php
+++ b/src/Response/NewAddress.php
@@ -3,7 +3,7 @@
  * Sake
  *
  * @link      http://github.com/sandrokeil/BlockchainWalletApi for the canonical source repository
- * @copyright Copyright (c) 2014 Sandro Keil
+ * @copyright Copyright (c) 2014 - 2015 Sandro Keil
  * @license   http://github.com/sandrokeil/BlockchainWalletApi/blob/master/LICENSE.txt New BSD License
  */
 
diff --git a/src/Response/ResponseInterface.php b/src/Response/ResponseInterface.php
index a63fbfc..80a23c4 100644
--- a/src/Response/ResponseInterface.php
+++ b/src/Response/ResponseInterface.php
@@ -3,7 +3,7 @@
  * Sake
  *
  * @link      http://github.com/sandrokeil/BlockchainWalletApi for the canonical source repository
- * @copyright Copyright (c) 2014 Sandro Keil
+ * @copyright Copyright (c) 2014 - 2015 Sandro Keil
  * @license   http://github.com/sandrokeil/BlockchainWalletApi/blob/master/LICENSE.txt New BSD License
  */
 
diff --git a/src/Response/Send.php b/src/Response/Send.php
index 341ffc4..7bfae71 100644
--- a/src/Response/Send.php
+++ b/src/Response/Send.php
@@ -3,7 +3,7 @@
  * Sake
  *
  * @link      http://github.com/sandrokeil/BlockchainWalletApi for the canonical source repository
- * @copyright Copyright (c) 2014 Sandro Keil
+ * @copyright Copyright (c) 2014 - 2015 Sandro Keil
  * @license   http://github.com/sandrokeil/BlockchainWalletApi/blob/master/LICENSE.txt New BSD License
  */
 
diff --git a/src/Response/SendMany.php b/src/Response/SendMany.php
index 761e2ac..7ebc787 100644
--- a/src/Response/SendMany.php
+++ b/src/Response/SendMany.php
@@ -3,7 +3,7 @@
  * Sake
  *
  * @link      http://github.com/sandrokeil/BlockchainWalletApi for the canonical source repository
- * @copyright Copyright (c) 2014 Sandro Keil
+ * @copyright Copyright (c) 2014 - 2015 Sandro Keil
  * @license   http://github.com/sandrokeil/BlockchainWalletApi/blob/master/LICENSE.txt New BSD License
  */
 
diff --git a/src/Response/WalletBalance.php b/src/Response/WalletBalance.php
index 245bc4c..fc1c588 100644
--- a/src/Response/WalletBalance.php
+++ b/src/Response/WalletBalance.php
@@ -3,7 +3,7 @@
  * Sake
  *
  * @link      http://github.com/sandrokeil/BlockchainWalletApi for the canonical source repository
- * @copyright Copyright (c) 2014 Sandro Keil
+ * @copyright Copyright (c) 2014 - 2015 Sandro Keil
  * @license   http://github.com/sandrokeil/BlockchainWalletApi/blob/master/LICENSE.txt New BSD License
  */
 
diff --git a/src/Service/BlockchainWallet.php b/src/Service/BlockchainWallet.php
index 153c5e4..fefe7a9 100644
--- a/src/Service/BlockchainWallet.php
+++ b/src/Service/BlockchainWallet.php
@@ -3,7 +3,7 @@
  * Sake
  *
  * @link      http://github.com/sandrokeil/BlockchainWalletApi for the canonical source repository
- * @copyright Copyright (c) 2014 Sandro Keil
+ * @copyright Copyright (c) 2014 - 2015 Sandro Keil
  * @license   http://github.com/sandrokeil/BlockchainWalletApi/blob/master/LICENSE.txt New BSD License
  */
 
diff --git a/src/Service/BlockchainWalletFactory.php b/src/Service/BlockchainWalletFactory.php
index b434edb..b373725 100644
--- a/src/Service/BlockchainWalletFactory.php
+++ b/src/Service/BlockchainWalletFactory.php
@@ -3,7 +3,7 @@
  * Sake
  *
  * @link      http://github.com/sandrokeil/BlockchainWalletApi for the canonical source repository
- * @copyright Copyright (c) 2014 Sandro Keil
+ * @copyright Copyright (c) 2014 - 2015 Sandro Keil
  * @license   http://github.com/sandrokeil/BlockchainWalletApi/blob/master/LICENSE.txt New BSD License
  */
 
diff --git a/src/Service/BlockchainWalletOptions.php b/src/Service/BlockchainWalletOptions.php
index 4b346db..9ecd0e5 100644
--- a/src/Service/BlockchainWalletOptions.php
+++ b/src/Service/BlockchainWalletOptions.php
@@ -3,7 +3,7 @@
  * Sake
  *
  * @link      http://github.com/sandrokeil/BlockchainWalletApi for the canonical source repository
- * @copyright Copyright (c) 2014 Sandro Keil
+ * @copyright Copyright (c) 2014 - 2015 Sandro Keil
  * @license   http://github.com/sandrokeil/BlockchainWalletApi/blob/master/LICENSE.txt New BSD License
  */
 
diff --git a/src/Service/HydratorFactory.php b/src/Service/HydratorFactory.php
index 8979b03..db76772 100644
--- a/src/Service/HydratorFactory.php
+++ b/src/Service/HydratorFactory.php
@@ -3,7 +3,7 @@
  * Sake
  *
  * @link      http://github.com/sandrokeil/BlockchainWalletApi for the canonical source repository
- * @copyright Copyright (c) 2014 Sandro Keil
+ * @copyright Copyright (c) 2014 - 2015 Sandro Keil
  * @license   http://github.com/sandrokeil/BlockchainWalletApi/blob/master/LICENSE.txt New BSD License
  */
 
diff --git a/src/Service/InputFilter/AddressArchiveFactory.php b/src/Service/InputFilter/AddressArchiveFactory.php
index 920c9c1..b2f878d 100644
--- a/src/Service/InputFilter/AddressArchiveFactory.php
+++ b/src/Service/InputFilter/AddressArchiveFactory.php
@@ -3,7 +3,7 @@
  * Sake
  *
  * @link      http://github.com/sandrokeil/BlockchainWalletApi for the canonical source repository
- * @copyright Copyright (c) 2014 Sandro Keil
+ * @copyright Copyright (c) 2014 - 2015 Sandro Keil
  * @license   http://github.com/sandrokeil/BlockchainWalletApi/blob/master/LICENSE.txt New BSD License
  */
 
diff --git a/src/Service/InputFilter/AddressBalanceFactory.php b/src/Service/InputFilter/AddressBalanceFactory.php
index 3b99c43..b8dbe96 100644
--- a/src/Service/InputFilter/AddressBalanceFactory.php
+++ b/src/Service/InputFilter/AddressBalanceFactory.php
@@ -3,7 +3,7 @@
  * Sake
  *
  * @link      http://github.com/sandrokeil/BlockchainWalletApi for the canonical source repository
- * @copyright Copyright (c) 2014 Sandro Keil
+ * @copyright Copyright (c) 2014 - 2015 Sandro Keil
  * @license   http://github.com/sandrokeil/BlockchainWalletApi/blob/master/LICENSE.txt New BSD License
  */
 
diff --git a/src/Service/InputFilter/AddressUnarchiveFactory.php b/src/Service/InputFilter/AddressUnarchiveFactory.php
index 7d2c33b..bf29b82 100644
--- a/src/Service/InputFilter/AddressUnarchiveFactory.php
+++ b/src/Service/InputFilter/AddressUnarchiveFactory.php
@@ -3,7 +3,7 @@
  * Sake
  *
  * @link      http://github.com/sandrokeil/BlockchainWalletApi for the canonical source repository
- * @copyright Copyright (c) 2014 Sandro Keil
+ * @copyright Copyright (c) 2014 - 2015 Sandro Keil
  * @license   http://github.com/sandrokeil/BlockchainWalletApi/blob/master/LICENSE.txt New BSD License
  */
 
diff --git a/src/Service/InputFilter/AutoConsolidateAddressesFactory.php b/src/Service/InputFilter/AutoConsolidateAddressesFactory.php
index 9b7a831..5f27f1e 100644
--- a/src/Service/InputFilter/AutoConsolidateAddressesFactory.php
+++ b/src/Service/InputFilter/AutoConsolidateAddressesFactory.php
@@ -3,7 +3,7 @@
  * Sake
  *
  * @link      http://github.com/sandrokeil/BlockchainWalletApi for the canonical source repository
- * @copyright Copyright (c) 2014 Sandro Keil
+ * @copyright Copyright (c) 2014 - 2015 Sandro Keil
  * @license   http://github.com/sandrokeil/BlockchainWalletApi/blob/master/LICENSE.txt New BSD License
  */
 
diff --git a/src/Service/InputFilter/ListAddressesFactory.php b/src/Service/InputFilter/ListAddressesFactory.php
index b5c762c..1de41d3 100644
--- a/src/Service/InputFilter/ListAddressesFactory.php
+++ b/src/Service/InputFilter/ListAddressesFactory.php
@@ -3,7 +3,7 @@
  * Sake
  *
  * @link      http://github.com/sandrokeil/BlockchainWalletApi for the canonical source repository
- * @copyright Copyright (c) 2014 Sandro Keil
+ * @copyright Copyright (c) 2014 - 2015 Sandro Keil
  * @license   http://github.com/sandrokeil/BlockchainWalletApi/blob/master/LICENSE.txt New BSD License
  */
 
diff --git a/src/Service/InputFilter/NewAddressFactory.php b/src/Service/InputFilter/NewAddressFactory.php
index 77ff985..d89cc31 100644
--- a/src/Service/InputFilter/NewAddressFactory.php
+++ b/src/Service/InputFilter/NewAddressFactory.php
@@ -3,7 +3,7 @@
  * Sake
  *
  * @link      http://github.com/sandrokeil/BlockchainWalletApi for the canonical source repository
- * @copyright Copyright (c) 2014 Sandro Keil
+ * @copyright Copyright (c) 2014 - 2015 Sandro Keil
  * @license   http://github.com/sandrokeil/BlockchainWalletApi/blob/master/LICENSE.txt New BSD License
  */
 
diff --git a/src/Service/InputFilter/SendFactory.php b/src/Service/InputFilter/SendFactory.php
index 1b26162..1f0a3dc 100644
--- a/src/Service/InputFilter/SendFactory.php
+++ b/src/Service/InputFilter/SendFactory.php
@@ -3,7 +3,7 @@
  * Sake
  *
  * @link      http://github.com/sandrokeil/BlockchainWalletApi for the canonical source repository
- * @copyright Copyright (c) 2014 Sandro Keil
+ * @copyright Copyright (c) 2014 - 2015 Sandro Keil
  * @license   http://github.com/sandrokeil/BlockchainWalletApi/blob/master/LICENSE.txt New BSD License
  */
 
diff --git a/src/Service/InputFilter/SendManyFactory.php b/src/Service/InputFilter/SendManyFactory.php
index b2c9786..bd5bb46 100644
--- a/src/Service/InputFilter/SendManyFactory.php
+++ b/src/Service/InputFilter/SendManyFactory.php
@@ -3,7 +3,7 @@
  * Sake
  *
  * @link      http://github.com/sandrokeil/BlockchainWalletApi for the canonical source repository
- * @copyright Copyright (c) 2014 Sandro Keil
+ * @copyright Copyright (c) 2014 - 2015 Sandro Keil
  * @license   http://github.com/sandrokeil/BlockchainWalletApi/blob/master/LICENSE.txt New BSD License
  */
 
diff --git a/src/Service/InputFilter/WalletBalanceFactory.php b/src/Service/InputFilter/WalletBalanceFactory.php
index 9dbf2eb..ebf9f03 100644
--- a/src/Service/InputFilter/WalletBalanceFactory.php
+++ b/src/Service/InputFilter/WalletBalanceFactory.php
@@ -3,7 +3,7 @@
  * Sake
  *
  * @link      http://github.com/sandrokeil/BlockchainWalletApi for the canonical source repository
- * @copyright Copyright (c) 2014 Sandro Keil
+ * @copyright Copyright (c) 2014 - 2015 Sandro Keil
  * @license   http://github.com/sandrokeil/BlockchainWalletApi/blob/master/LICENSE.txt New BSD License
  */
 
diff --git a/src/Service/InputFilterPluginManager.php b/src/Service/InputFilterPluginManager.php
index fe866a4..95d48f4 100644
--- a/src/Service/InputFilterPluginManager.php
+++ b/src/Service/InputFilterPluginManager.php
@@ -3,7 +3,7 @@
  * Sake
  *
  * @link      http://github.com/sandrokeil/BlockchainWalletApi for the canonical source repository
- * @copyright Copyright (c) 2014 Sandro Keil
+ * @copyright Copyright (c) 2014 - 2015 Sandro Keil
  * @license   http://github.com/sandrokeil/BlockchainWalletApi/blob/master/LICENSE.txt New BSD License
  */
 
diff --git a/src/Service/RequestPluginManager.php b/src/Service/RequestPluginManager.php
index a405d1e..d70bf31 100644
--- a/src/Service/RequestPluginManager.php
+++ b/src/Service/RequestPluginManager.php
@@ -3,7 +3,7 @@
  * Sake
  *
  * @link      http://github.com/sandrokeil/BlockchainWalletApi for the canonical source repository
- * @copyright Copyright (c) 2014 Sandro Keil
+ * @copyright Copyright (c) 2014 - 2015 Sandro Keil
  * @license   http://github.com/sandrokeil/BlockchainWalletApi/blob/master/LICENSE.txt New BSD License
  */
 
diff --git a/src/Service/ResponsePluginManager.php b/src/Service/ResponsePluginManager.php
index 745f77c..08fb877 100644
--- a/src/Service/ResponsePluginManager.php
+++ b/src/Service/ResponsePluginManager.php
@@ -3,7 +3,7 @@
  * Sake
  *
  * @link      http://github.com/sandrokeil/BlockchainWalletApi for the canonical source repository
- * @copyright Copyright (c) 2014 Sandro Keil
+ * @copyright Copyright (c) 2014 - 2015 Sandro Keil
  * @license   http://github.com/sandrokeil/BlockchainWalletApi/blob/master/LICENSE.txt New BSD License
  */
 
diff --git a/src/Validator/BitcoinAddress.php b/src/Validator/BitcoinAddress.php
index 1ed1016..09efbd1 100644
--- a/src/Validator/BitcoinAddress.php
+++ b/src/Validator/BitcoinAddress.php
@@ -3,7 +3,7 @@
  * Sake
  *
  * @link      http://github.com/sandrokeil/BlockchainWalletApi for the canonical source repository
- * @copyright Copyright (c) 2014 Sandro Keil
+ * @copyright Copyright (c) 2014 - 2015 Sandro Keil
  * @license   http://github.com/sandrokeil/BlockchainWalletApi/blob/master/LICENSE.txt New BSD License
  */
 
diff --git a/src/Validator/Exception/ExceptionInterface.php b/src/Validator/Exception/ExceptionInterface.php
index f849a25..ae74ea9 100644
--- a/src/Validator/Exception/ExceptionInterface.php
+++ b/src/Validator/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
  * Sake
  *
  * @link      http://github.com/sandrokeil/BlockchainWalletApi for the canonical source repository
- * @copyright Copyright (c) 2014 Sandro Keil
+ * @copyright Copyright (c) 2014 - 2015 Sandro Keil
  * @license   http://github.com/sandrokeil/BlockchainWalletApi/blob/master/LICENSE.txt New BSD License
  */
 
diff --git a/src/Validator/Exception/RuntimeException.php b/src/Validator/Exception/RuntimeException.php
index c8ba34d..c05e3c7 100644
--- a/src/Validator/Exception/RuntimeException.php
+++ b/src/Validator/Exception/RuntimeException.php
@@ -3,7 +3,7 @@
  * Sake
  *
  * @link      http://github.com/sandrokeil/BlockchainWalletApi for the canonical source repository
- * @copyright Copyright (c) 2014 Sandro Keil
+ * @copyright Copyright (c) 2014 - 2015 Sandro Keil
  * @license   http://github.com/sandrokeil/BlockchainWalletApi/blob/master/LICENSE.txt New BSD License
  */
 
diff --git a/src/Validator/Exception/ValidatorException.php b/src/Validator/Exception/ValidatorException.php
index 50b4287..737e5ba 100644
--- a/src/Validator/Exception/ValidatorException.php
+++ b/src/Validator/Exception/ValidatorException.php
@@ -3,7 +3,7 @@
  * Sake
  *
  * @link      http://github.com/sandrokeil/BlockchainWalletApi for the canonical source repository
- * @copyright Copyright (c) 2014 Sandro Keil
+ * @copyright Copyright (c) 2014 - 2015 Sandro Keil
  * @license   http://github.com/sandrokeil/BlockchainWalletApi/blob/master/LICENSE.txt New BSD License
  */
 
diff --git a/src/View/Helper/Satoshi.php b/src/View/Helper/Satoshi.php
index bf397d8..f69ce9d 100644
--- a/src/View/Helper/Satoshi.php
+++ b/src/View/Helper/Satoshi.php
@@ -3,7 +3,7 @@
  * Sake
  *
  * @link      http://github.com/sandrokeil/BlockchainWalletApi for the canonical source repository
- * @copyright Copyright (c) 2014 Sandro Keil
+ * @copyright Copyright (c) 2014 - 2015 Sandro Keil
  * @license   http://github.com/sandrokeil/BlockchainWalletApi/blob/master/LICENSE.txt New BSD License
  */
 
diff --git a/test/Bootstrap.php b/test/Bootstrap.php
index cd62493..7b8e97f 100644
--- a/test/Bootstrap.php
+++ b/test/Bootstrap.php
@@ -3,7 +3,7 @@
  * Sake
  *
  * @link      http://github.com/sandrokeil/BlockchainWalletApi for the canonical source repository
- * @copyright Copyright (c) 2014 Sandro Keil
+ * @copyright Copyright (c) 2014 - 2015 Sandro Keil
  * @license   http://github.com/sandrokeil/BlockchainWalletApi/blob/master/LICENSE.txt New BSD License
  */
 
diff --git a/test/Hydrator/AddressListStrategyTest.php b/test/Hydrator/AddressListStrategyTest.php
index 340a3d0..0fb7844 100644
--- a/test/Hydrator/AddressListStrategyTest.php
+++ b/test/Hydrator/AddressListStrategyTest.php
@@ -3,7 +3,7 @@
  * Sake
  *
  * @link      http://github.com/sandrokeil/BlockchainWalletApi for the canonical source repository
- * @copyright Copyright (c) 2014 Sandro Keil
+ * @copyright Copyright (c) 2014 - 2015 Sandro Keil
  * @license   http://github.com/sandrokeil/BlockchainWalletApi/blob/master/LICENSE.txt New BSD License
  */
 
diff --git a/test/Hydrator/AddressStrategyTest.php b/test/Hydrator/AddressStrategyTest.php
index 80b16b1..ad4f1ea 100644
--- a/test/Hydrator/AddressStrategyTest.php
+++ b/test/Hydrator/AddressStrategyTest.php
@@ -3,7 +3,7 @@
  * Sake
  *
  * @link      http://github.com/sandrokeil/BlockchainWalletApi for the canonical source repository
- * @copyright Copyright (c) 2014 Sandro Keil
+ * @copyright Copyright (c) 2014 - 2015 Sandro Keil
  * @license   http://github.com/sandrokeil/BlockchainWalletApi/blob/master/LICENSE.txt New BSD License
  */
 
diff --git a/test/ModuleTest.php b/test/ModuleTest.php
index 01a4f6e..ca650b5 100644
--- a/test/ModuleTest.php
+++ b/test/ModuleTest.php
@@ -3,7 +3,7 @@
  * Sake
  *
  * @link      http://github.com/sandrokeil/BlockchainWalletApi for the canonical source repository
- * @copyright Copyright (c) 2014 Sandro Keil
+ * @copyright Copyright (c) 2014 - 2015 Sandro Keil
  * @license   http://github.com/sandrokeil/BlockchainWalletApi/blob/master/LICENSE.txt New BSD License
  */
 
@@ -19,34 +19,18 @@
 class ModuleTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * Tests getServiceConfig() should should return service manager configuration
+     * Tests getConfig() should should return module configuration
      *
-     * @covers \Sake\BlockchainWalletApi\Module::getServiceConfig
+     * @covers \Sake\BlockchainWalletApi\Module::getConfig
      */
-    public function testGetServiceConfig()
+    public function testGetConfig()
     {
         $cut = new Module();
-        $config = $cut->getServiceConfig();
+        $config = $cut->getConfig();
         $this->assertSame(
-            @include 'config/service_manager.config.php',
+            @include 'config/module.config.php',
             $config,
-            'Service manager configuration could not be read'
-        );
-    }
-
-    /**
-     * Tests getViewHelperConfig() should should return view helper configuration
-     *
-     * @covers \Sake\BlockchainWalletApi\Module::getViewHelperConfig
-     */
-    public function testGetViewHelperConfig()
-    {
-        $cut = new Module();
-        $config = $cut->getViewHelperConfig();
-        $this->assertSame(
-            @include 'config/view_helper.config.php',
-            $config,
-            'View helper configuration could not be read'
+            'Module configuration could not be read'
         );
     }
 }
diff --git a/test/Request/AddressArchiveTest.php b/test/Request/AddressArchiveTest.php
index f33c6c5..0257989 100644
--- a/test/Request/AddressArchiveTest.php
+++ b/test/Request/AddressArchiveTest.php
@@ -3,7 +3,7 @@
  * Sake
  *
  * @link      http://github.com/sandrokeil/BlockchainWalletApi for the canonical source repository
- * @copyright Copyright (c) 2014 Sandro Keil
+ * @copyright Copyright (c) 2014 - 2015 Sandro Keil
  * @license   http://github.com/sandrokeil/BlockchainWalletApi/blob/master/LICENSE.txt New BSD License
  */
 
diff --git a/test/Request/AddressBalanceTest.php b/test/Request/AddressBalanceTest.php
index f344661..ac9db7d 100644
--- a/test/Request/AddressBalanceTest.php
+++ b/test/Request/AddressBalanceTest.php
@@ -3,7 +3,7 @@
  * Sake
  *
  * @link      http://github.com/sandrokeil/BlockchainWalletApi for the canonical source repository
- * @copyright Copyright (c) 2014 Sandro Keil
+ * @copyright Copyright (c) 2014 - 2015 Sandro Keil
  * @license   http://github.com/sandrokeil/BlockchainWalletApi/blob/master/LICENSE.txt New BSD License
  */
 
diff --git a/test/Request/AddressUnarchiveTest.php b/test/Request/AddressUnarchiveTest.php
index 120bc5d..7723acc 100644
--- a/test/Request/AddressUnarchiveTest.php
+++ b/test/Request/AddressUnarchiveTest.php
@@ -3,7 +3,7 @@
  * Sake
  *
  * @link      http://github.com/sandrokeil/BlockchainWalletApi for the canonical source repository
- * @copyright Copyright (c) 2014 Sandro Keil
+ * @copyright Copyright (c) 2014 - 2015 Sandro Keil
  * @license   http://github.com/sandrokeil/BlockchainWalletApi/blob/master/LICENSE.txt New BSD License
  */
 
diff --git a/test/Request/AutoConsolidateAddressesTest.php b/test/Request/AutoConsolidateAddressesTest.php
index 32df0fb..e0da8af 100644
--- a/test/Request/AutoConsolidateAddressesTest.php
+++ b/test/Request/AutoConsolidateAddressesTest.php
@@ -3,7 +3,7 @@
  * Sake
  *
  * @link      http://github.com/sandrokeil/BlockchainWalletApi for the canonical source repository
- * @copyright Copyright (c) 2014 Sandro Keil
+ * @copyright Copyright (c) 2014 - 2015 Sandro Keil
  * @license   http://github.com/sandrokeil/BlockchainWalletApi/blob/master/LICENSE.txt New BSD License
  */
 
diff --git a/test/Request/ListAddressesTest.php b/test/Request/ListAddressesTest.php
index c3ae4e5..c3385d5 100644
--- a/test/Request/ListAddressesTest.php
+++ b/test/Request/ListAddressesTest.php
@@ -3,7 +3,7 @@
  * Sake
  *
  * @link      http://github.com/sandrokeil/BlockchainWalletApi for the canonical source repository
- * @copyright Copyright (c) 2014 Sandro Keil
+ * @copyright Copyright (c) 2014 - 2015 Sandro Keil
  * @license   http://github.com/sandrokeil/BlockchainWalletApi/blob/master/LICENSE.txt New BSD License
  */
 
diff --git a/test/Request/NewAddressTest.php b/test/Request/NewAddressTest.php
index 7ccf15e..c993101 100644
--- a/test/Request/NewAddressTest.php
+++ b/test/Request/NewAddressTest.php
@@ -3,7 +3,7 @@
  * Sake
  *
  * @link      http://github.com/sandrokeil/BlockchainWalletApi for the canonical source repository
- * @copyright Copyright (c) 2014 Sandro Keil
+ * @copyright Copyright (c) 2014 - 2015 Sandro Keil
  * @license   http://github.com/sandrokeil/BlockchainWalletApi/blob/master/LICENSE.txt New BSD License
  */
 
diff --git a/test/Request/RecipientTest.php b/test/Request/RecipientTest.php
index c97c4e9..e504c51 100644
--- a/test/Request/RecipientTest.php
+++ b/test/Request/RecipientTest.php
@@ -3,7 +3,7 @@
  * Sake
  *
  * @link      http://github.com/sandrokeil/BlockchainWalletApi for the canonical source repository
- * @copyright Copyright (c) 2014 Sandro Keil
+ * @copyright Copyright (c) 2014 - 2015 Sandro Keil
  * @license   http://github.com/sandrokeil/BlockchainWalletApi/blob/master/LICENSE.txt New BSD License
  */
 
diff --git a/test/Request/SendManyTest.php b/test/Request/SendManyTest.php
index 8f5600b..b4c619d 100644
--- a/test/Request/SendManyTest.php
+++ b/test/Request/SendManyTest.php
@@ -3,7 +3,7 @@
  * Sake
  *
  * @link      http://github.com/sandrokeil/BlockchainWalletApi for the canonical source repository
- * @copyright Copyright (c) 2014 Sandro Keil
+ * @copyright Copyright (c) 2014 - 2015 Sandro Keil
  * @license   http://github.com/sandrokeil/BlockchainWalletApi/blob/master/LICENSE.txt New BSD License
  */
 
diff --git a/test/Request/SendTest.php b/test/Request/SendTest.php
index d135c6e..b19af70 100644
--- a/test/Request/SendTest.php
+++ b/test/Request/SendTest.php
@@ -3,7 +3,7 @@
  * Sake
  *
  * @link      http://github.com/sandrokeil/BlockchainWalletApi for the canonical source repository
- * @copyright Copyright (c) 2014 Sandro Keil
+ * @copyright Copyright (c) 2014 - 2015 Sandro Keil
  * @license   http://github.com/sandrokeil/BlockchainWalletApi/blob/master/LICENSE.txt New BSD License
  */
 
diff --git a/test/Request/WalletBalanceTest.php b/test/Request/WalletBalanceTest.php
index bb6bafc..ecaf502 100644
--- a/test/Request/WalletBalanceTest.php
+++ b/test/Request/WalletBalanceTest.php
@@ -3,7 +3,7 @@
  * Sake
  *
  * @link      http://github.com/sandrokeil/BlockchainWalletApi for the canonical source repository
- * @copyright Copyright (c) 2014 Sandro Keil
+ * @copyright Copyright (c) 2014 - 2015 Sandro Keil
  * @license   http://github.com/sandrokeil/BlockchainWalletApi/blob/master/LICENSE.txt New BSD License
  */
 
diff --git a/test/Response/AddressArchiveTest.php b/test/Response/AddressArchiveTest.php
index db86cd3..89ff2e1 100644
--- a/test/Response/AddressArchiveTest.php
+++ b/test/Response/AddressArchiveTest.php
@@ -3,7 +3,7 @@
  * Sake
  *
  * @link      http://github.com/sandrokeil/BlockchainWalletApi for the canonical source repository
- * @copyright Copyright (c) 2014 Sandro Keil
+ * @copyright Copyright (c) 2014 - 2015 Sandro Keil
  * @license   http://github.com/sandrokeil/BlockchainWalletApi/blob/master/LICENSE.txt New BSD License
  */
 
diff --git a/test/Response/AddressBalanceTest.php b/test/Response/AddressBalanceTest.php
index abd226c..3b5177b 100644
--- a/test/Response/AddressBalanceTest.php
+++ b/test/Response/AddressBalanceTest.php
@@ -3,7 +3,7 @@
  * Sake
  *
  * @link      http://github.com/sandrokeil/BlockchainWalletApi for the canonical source repository
- * @copyright Copyright (c) 2014 Sandro Keil
+ * @copyright Copyright (c) 2014 - 2015 Sandro Keil
  * @license   http://github.com/sandrokeil/BlockchainWalletApi/blob/master/LICENSE.txt New BSD License
  */
 
diff --git a/test/Response/AddressTest.php b/test/Response/AddressTest.php
index 8e4cde3..d3054c8 100644
--- a/test/Response/AddressTest.php
+++ b/test/Response/AddressTest.php
@@ -3,7 +3,7 @@
  * Sake
  *
  * @link      http://github.com/sandrokeil/BlockchainWalletApi for the canonical source repository
- * @copyright Copyright (c) 2014 Sandro Keil
+ * @copyright Copyright (c) 2014 - 2015 Sandro Keil
  * @license   http://github.com/sandrokeil/BlockchainWalletApi/blob/master/LICENSE.txt New BSD License
  */
 
diff --git a/test/Response/AddressUnarchiveTest.php b/test/Response/AddressUnarchiveTest.php
index f123192..4186807 100644
--- a/test/Response/AddressUnarchiveTest.php
+++ b/test/Response/AddressUnarchiveTest.php
@@ -3,7 +3,7 @@
  * Sake
  *
  * @link      http://github.com/sandrokeil/BlockchainWalletApi for the canonical source repository
- * @copyright Copyright (c) 2014 Sandro Keil
+ * @copyright Copyright (c) 2014 - 2015 Sandro Keil
  * @license   http://github.com/sandrokeil/BlockchainWalletApi/blob/master/LICENSE.txt New BSD License
  */
 
diff --git a/test/Response/AutoConsolidateAddressesTest.php b/test/Response/AutoConsolidateAddressesTest.php
index 21e33e3..ac5ecd9 100644
--- a/test/Response/AutoConsolidateAddressesTest.php
+++ b/test/Response/AutoConsolidateAddressesTest.php
@@ -3,7 +3,7 @@
  * Sake
  *
  * @link      http://github.com/sandrokeil/BlockchainWalletApi for the canonical source repository
- * @copyright Copyright (c) 2014 Sandro Keil
+ * @copyright Copyright (c) 2014 - 2015 Sandro Keil
  * @license   http://github.com/sandrokeil/BlockchainWalletApi/blob/master/LICENSE.txt New BSD License
  */
 
diff --git a/test/Response/ListAddressesTest.php b/test/Response/ListAddressesTest.php
index 8620c5e..b4ff747 100644
--- a/test/Response/ListAddressesTest.php
+++ b/test/Response/ListAddressesTest.php
@@ -3,7 +3,7 @@
  * Sake
  *
  * @link      http://github.com/sandrokeil/BlockchainWalletApi for the canonical source repository
- * @copyright Copyright (c) 2014 Sandro Keil
+ * @copyright Copyright (c) 2014 - 2015 Sandro Keil
  * @license   http://github.com/sandrokeil/BlockchainWalletApi/blob/master/LICENSE.txt New BSD License
  */
 
diff --git a/test/Response/NewAddressTest.php b/test/Response/NewAddressTest.php
index da11608..39e2cf9 100644
--- a/test/Response/NewAddressTest.php
+++ b/test/Response/NewAddressTest.php
@@ -3,7 +3,7 @@
  * Sake
  *
  * @link      http://github.com/sandrokeil/BlockchainWalletApi for the canonical source repository
- * @copyright Copyright (c) 2014 Sandro Keil
+ * @copyright Copyright (c) 2014 - 2015 Sandro Keil
  * @license   http://github.com/sandrokeil/BlockchainWalletApi/blob/master/LICENSE.txt New BSD License
  */
 
diff --git a/test/Response/SendManyTest.php b/test/Response/SendManyTest.php
index 4d7c2d6..ed324ae 100644
--- a/test/Response/SendManyTest.php
+++ b/test/Response/SendManyTest.php
@@ -3,7 +3,7 @@
  * Sake
  *
  * @link      http://github.com/sandrokeil/BlockchainWalletApi for the canonical source repository
- * @copyright Copyright (c) 2014 Sandro Keil
+ * @copyright Copyright (c) 2014 - 2015 Sandro Keil
  * @license   http://github.com/sandrokeil/BlockchainWalletApi/blob/master/LICENSE.txt New BSD License
  */
 
diff --git a/test/Response/SendTest.php b/test/Response/SendTest.php
index d29ae5b..54ff3b9 100644
--- a/test/Response/SendTest.php
+++ b/test/Response/SendTest.php
@@ -3,7 +3,7 @@
  * Sake
  *
  * @link      http://github.com/sandrokeil/BlockchainWalletApi for the canonical source repository
- * @copyright Copyright (c) 2014 Sandro Keil
+ * @copyright Copyright (c) 2014 - 2015 Sandro Keil
  * @license   http://github.com/sandrokeil/BlockchainWalletApi/blob/master/LICENSE.txt New BSD License
  */
 
diff --git a/test/Response/WalletBalanceTest.php b/test/Response/WalletBalanceTest.php
index 910ddac..ae38e8c 100644
--- a/test/Response/WalletBalanceTest.php
+++ b/test/Response/WalletBalanceTest.php
@@ -3,7 +3,7 @@
  * Sake
  *
  * @link      http://github.com/sandrokeil/BlockchainWalletApi for the canonical source repository
- * @copyright Copyright (c) 2014 Sandro Keil
+ * @copyright Copyright (c) 2014 - 2015 Sandro Keil
  * @license   http://github.com/sandrokeil/BlockchainWalletApi/blob/master/LICENSE.txt New BSD License
  */
 
diff --git a/test/Service/AbstractFactoryTestCase.php b/test/Service/AbstractFactoryTestCase.php
index 2b2c24d..c12a859 100644
--- a/test/Service/AbstractFactoryTestCase.php
+++ b/test/Service/AbstractFactoryTestCase.php
@@ -3,13 +3,13 @@
  * Sake
  *
  * @link      http://github.com/sandrokeil/BlockchainWalletApi for the canonical source repository
- * @copyright Copyright (c) 2014 Sandro Keil
+ * @copyright Copyright (c) 2014 - 2015 Sandro Keil
  * @license   http://github.com/sandrokeil/BlockchainWalletApi/blob/master/LICENSE.txt New BSD License
  */
 
 namespace SakeTest\BlockchainWalletApi\Service;
 
-use Zend\Test\Util\ModuleLoader;
+use Zend\ServiceManager\ServiceManager;
 use PHPUnit_Framework_TestCase as TestCase;
 
 /**
@@ -24,11 +24,6 @@ abstract class AbstractFactoryTestCase extends TestCase
      */
     protected $serviceManager;
 
-    /**
-     * @var ModuleLoader
-     */
-    protected $moduleLoader;
-
     /**
      * Setup tests
      */
@@ -38,11 +33,16 @@ public function setUp()
 
         // Load the user-defined test configuration file, if it exists; otherwise, load default
         if (is_readable('test/TestConfig.php')) {
-            $testConfig = require 'test/TestConfig.php';
+            $testConfig = require 'test/testing.config.php';
         } else {
-            $testConfig = require 'test/TestConfig.php.dist';
+            $testConfig = require 'test/testing.config.php.dist';
         }
-        $this->moduleLoader = new ModuleLoader($testConfig);
-        $this->serviceManager = $this->moduleLoader->getServiceManager();
+
+        $config = require 'config/module.config.php';
+
+        $this->serviceManager = new ServiceManager(
+            new \Zend\ServiceManager\Config($config['service_manager'])
+        );
+        $this->serviceManager->setService('Configuration', $testConfig);
     }
 }
diff --git a/test/Service/BlockchainWalletFactoryTest.php b/test/Service/BlockchainWalletFactoryTest.php
index ab403de..37cede9 100644
--- a/test/Service/BlockchainWalletFactoryTest.php
+++ b/test/Service/BlockchainWalletFactoryTest.php
@@ -3,7 +3,7 @@
  * Sake
  *
  * @link      http://github.com/sandrokeil/BlockchainWalletApi for the canonical source repository
- * @copyright Copyright (c) 2014 Sandro Keil
+ * @copyright Copyright (c) 2014 - 2015 Sandro Keil
  * @license   http://github.com/sandrokeil/BlockchainWalletApi/blob/master/LICENSE.txt New BSD License
  */
 
@@ -34,7 +34,8 @@ public function testCreateService()
             ->method('getClient')
             ->will($this->returnValue(new Http\Client(null, array('adapter' => new Http\Client\Adapter\Test()))));
 
-        $config = $this->serviceManager->get('Config');
+        $config = $this->serviceManager->get('Configuration');
+
         $config = $config['sake_bwa']['connection']['default']['options'];
 
         /* @var $service \Sake\BlockchainWalletApi\Service\BlockchainWallet */
diff --git a/test/Service/BlockchainWalletOptionsTest.php b/test/Service/BlockchainWalletOptionsTest.php
index df1a843..af2ed5c 100644
--- a/test/Service/BlockchainWalletOptionsTest.php
+++ b/test/Service/BlockchainWalletOptionsTest.php
@@ -3,7 +3,7 @@
  * Sake
  *
  * @link      http://github.com/sandrokeil/BlockchainWalletApi for the canonical source repository
- * @copyright Copyright (c) 2014 Sandro Keil
+ * @copyright Copyright (c) 2014 - 2015 Sandro Keil
  * @license   http://github.com/sandrokeil/BlockchainWalletApi/blob/master/LICENSE.txt New BSD License
  */
 
diff --git a/test/Service/BlockchainWalletTest.php b/test/Service/BlockchainWalletTest.php
index ffe6124..cfe11f2 100644
--- a/test/Service/BlockchainWalletTest.php
+++ b/test/Service/BlockchainWalletTest.php
@@ -3,7 +3,7 @@
  * Sake
  *
  * @link      http://github.com/sandrokeil/BlockchainWalletApi for the canonical source repository
- * @copyright Copyright (c) 2014 Sandro Keil
+ * @copyright Copyright (c) 2014 - 2015 Sandro Keil
  * @license   http://github.com/sandrokeil/BlockchainWalletApi/blob/master/LICENSE.txt New BSD License
  */
 
diff --git a/test/Service/HydratorFactoryTest.php b/test/Service/HydratorFactoryTest.php
index 96f93b6..06b3698 100644
--- a/test/Service/HydratorFactoryTest.php
+++ b/test/Service/HydratorFactoryTest.php
@@ -3,7 +3,7 @@
  * Sake
  *
  * @link      http://github.com/sandrokeil/HydratorApi for the canonical source repository
- * @copyright Copyright (c) 2014 Sandro Keil
+ * @copyright Copyright (c) 2014 - 2015 Sandro Keil
  * @license   http://github.com/sandrokeil/HydratorApi/blob/master/LICENSE.txt New BSD License
  */
 
diff --git a/test/Service/InputFilter/AddressArchiveFactoryTest.php b/test/Service/InputFilter/AddressArchiveFactoryTest.php
index 0076c17..0607039 100644
--- a/test/Service/InputFilter/AddressArchiveFactoryTest.php
+++ b/test/Service/InputFilter/AddressArchiveFactoryTest.php
@@ -3,7 +3,7 @@
  * Sake
  *
  * @link      http://github.com/sandrokeil/BlockchainWalletApi for the canonical source repository
- * @copyright Copyright (c) 2014 Sandro Keil
+ * @copyright Copyright (c) 2014 - 2015 Sandro Keil
  * @license   http://github.com/sandrokeil/BlockchainWalletApi/blob/master/LICENSE.txt New BSD License
  */
 
diff --git a/test/Service/InputFilter/AddressBalanceFactoryTest.php b/test/Service/InputFilter/AddressBalanceFactoryTest.php
index 74132b5..abfabb4 100644
--- a/test/Service/InputFilter/AddressBalanceFactoryTest.php
+++ b/test/Service/InputFilter/AddressBalanceFactoryTest.php
@@ -3,7 +3,7 @@
  * Sake
  *
  * @link      http://github.com/sandrokeil/BlockchainWalletApi for the canonical source repository
- * @copyright Copyright (c) 2014 Sandro Keil
+ * @copyright Copyright (c) 2014 - 2015 Sandro Keil
  * @license   http://github.com/sandrokeil/BlockchainWalletApi/blob/master/LICENSE.txt New BSD License
  */
 
diff --git a/test/Service/InputFilter/AddressUnarchiveFactoryTest.php b/test/Service/InputFilter/AddressUnarchiveFactoryTest.php
index 895e5a8..bc92393 100644
--- a/test/Service/InputFilter/AddressUnarchiveFactoryTest.php
+++ b/test/Service/InputFilter/AddressUnarchiveFactoryTest.php
@@ -3,7 +3,7 @@
  * Sake
  *
  * @link      http://github.com/sandrokeil/BlockchainWalletApi for the canonical source repository
- * @copyright Copyright (c) 2014 Sandro Keil
+ * @copyright Copyright (c) 2014 - 2015 Sandro Keil
  * @license   http://github.com/sandrokeil/BlockchainWalletApi/blob/master/LICENSE.txt New BSD License
  */
 
diff --git a/test/Service/InputFilter/AutoConsolidateAddressesFactoryTest.php b/test/Service/InputFilter/AutoConsolidateAddressesFactoryTest.php
index c87802a..5642ab0 100644
--- a/test/Service/InputFilter/AutoConsolidateAddressesFactoryTest.php
+++ b/test/Service/InputFilter/AutoConsolidateAddressesFactoryTest.php
@@ -3,7 +3,7 @@
  * Sake
  *
  * @link      http://github.com/sandrokeil/BlockchainWalletApi for the canonical source repository
- * @copyright Copyright (c) 2014 Sandro Keil
+ * @copyright Copyright (c) 2014 - 2015 Sandro Keil
  * @license   http://github.com/sandrokeil/BlockchainWalletApi/blob/master/LICENSE.txt New BSD License
  */
 
diff --git a/test/Service/InputFilter/ListAddressesFactoryTest.php b/test/Service/InputFilter/ListAddressesFactoryTest.php
index 107c759..62ecbf9 100644
--- a/test/Service/InputFilter/ListAddressesFactoryTest.php
+++ b/test/Service/InputFilter/ListAddressesFactoryTest.php
@@ -3,7 +3,7 @@
  * Sake
  *
  * @link      http://github.com/sandrokeil/BlockchainWalletApi for the canonical source repository
- * @copyright Copyright (c) 2014 Sandro Keil
+ * @copyright Copyright (c) 2014 - 2015 Sandro Keil
  * @license   http://github.com/sandrokeil/BlockchainWalletApi/blob/master/LICENSE.txt New BSD License
  */
 
diff --git a/test/Service/InputFilter/NewAddressFactoryTest.php b/test/Service/InputFilter/NewAddressFactoryTest.php
index 040ab12..8111d60 100644
--- a/test/Service/InputFilter/NewAddressFactoryTest.php
+++ b/test/Service/InputFilter/NewAddressFactoryTest.php
@@ -3,7 +3,7 @@
  * Sake
  *
  * @link      http://github.com/sandrokeil/BlockchainWalletApi for the canonical source repository
- * @copyright Copyright (c) 2014 Sandro Keil
+ * @copyright Copyright (c) 2014 - 2015 Sandro Keil
  * @license   http://github.com/sandrokeil/BlockchainWalletApi/blob/master/LICENSE.txt New BSD License
  */
 
diff --git a/test/Service/InputFilter/SendFactoryTest.php b/test/Service/InputFilter/SendFactoryTest.php
index cba258a..d2270c0 100644
--- a/test/Service/InputFilter/SendFactoryTest.php
+++ b/test/Service/InputFilter/SendFactoryTest.php
@@ -3,7 +3,7 @@
  * Sake
  *
  * @link      http://github.com/sandrokeil/BlockchainWalletApi for the canonical source repository
- * @copyright Copyright (c) 2014 Sandro Keil
+ * @copyright Copyright (c) 2014 - 2015 Sandro Keil
  * @license   http://github.com/sandrokeil/BlockchainWalletApi/blob/master/LICENSE.txt New BSD License
  */
 
diff --git a/test/Service/InputFilter/SendManyFactoryTest.php b/test/Service/InputFilter/SendManyFactoryTest.php
index 5612a6f..26d9bab 100644
--- a/test/Service/InputFilter/SendManyFactoryTest.php
+++ b/test/Service/InputFilter/SendManyFactoryTest.php
@@ -3,7 +3,7 @@
  * Sake
  *
  * @link      http://github.com/sandrokeil/BlockchainWalletApi for the canonical source repository
- * @copyright Copyright (c) 2014 Sandro Keil
+ * @copyright Copyright (c) 2014 - 2015 Sandro Keil
  * @license   http://github.com/sandrokeil/BlockchainWalletApi/blob/master/LICENSE.txt New BSD License
  */
 
diff --git a/test/Service/InputFilter/WalletBalanceFactoryTest.php b/test/Service/InputFilter/WalletBalanceFactoryTest.php
index c5a27b8..a740e3b 100644
--- a/test/Service/InputFilter/WalletBalanceFactoryTest.php
+++ b/test/Service/InputFilter/WalletBalanceFactoryTest.php
@@ -3,7 +3,7 @@
  * Sake
  *
  * @link      http://github.com/sandrokeil/BlockchainWalletApi for the canonical source repository
- * @copyright Copyright (c) 2014 Sandro Keil
+ * @copyright Copyright (c) 2014 - 2015 Sandro Keil
  * @license   http://github.com/sandrokeil/BlockchainWalletApi/blob/master/LICENSE.txt New BSD License
  */
 
diff --git a/test/Service/InputFilterPluginManagerTest.php b/test/Service/InputFilterPluginManagerTest.php
index 26631c7..ea833a1 100644
--- a/test/Service/InputFilterPluginManagerTest.php
+++ b/test/Service/InputFilterPluginManagerTest.php
@@ -3,7 +3,7 @@
  * Sake
  *
  * @link      http://github.com/sandrokeil/BlockchainWalletApi for the canonical source repository
- * @copyright Copyright (c) 2014 Sandro Keil
+ * @copyright Copyright (c) 2014 - 2015 Sandro Keil
  * @license   http://github.com/sandrokeil/BlockchainWalletApi/blob/master/LICENSE.txt New BSD License
  */
 
diff --git a/test/Service/RequestPluginManagerTest.php b/test/Service/RequestPluginManagerTest.php
index 0696fc9..f3f6a95 100644
--- a/test/Service/RequestPluginManagerTest.php
+++ b/test/Service/RequestPluginManagerTest.php
@@ -3,7 +3,7 @@
  * Sake
  *
  * @link      http://github.com/sandrokeil/BlockchainWalletApi for the canonical source repository
- * @copyright Copyright (c) 2014 Sandro Keil
+ * @copyright Copyright (c) 2014 - 2015 Sandro Keil
  * @license   http://github.com/sandrokeil/BlockchainWalletApi/blob/master/LICENSE.txt New BSD License
  */
 
diff --git a/test/Service/ResponsePluginManagerTest.php b/test/Service/ResponsePluginManagerTest.php
index ec599a2..62da8bf 100644
--- a/test/Service/ResponsePluginManagerTest.php
+++ b/test/Service/ResponsePluginManagerTest.php
@@ -3,7 +3,7 @@
  * Sake
  *
  * @link      http://github.com/sandrokeil/BlockchainWalletApi for the canonical source repository
- * @copyright Copyright (c) 2014 Sandro Keil
+ * @copyright Copyright (c) 2014 - 2015 Sandro Keil
  * @license   http://github.com/sandrokeil/BlockchainWalletApi/blob/master/LICENSE.txt New BSD License
  */
 
diff --git a/test/TestConfig.php.dist b/test/TestConfig.php.dist
deleted file mode 100644
index 98e5f68..0000000
--- a/test/TestConfig.php.dist
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-/**
- * Sake
- *
- * @link      http://github.com/sandrokeil/BlockchainWalletApi for the canonical source repository
- * @copyright Copyright (c) 2014 Sandro Keil
- * @license   http://github.com/sandrokeil/BlockchainWalletApi/blob/master/LICENSE.txt New BSD License
- */
-
-return array(
-    'modules' => array(
-        'Sake\BlockchainWalletApi',
-    ),
-    'module_listener_options' => array(
-        'config_glob_paths' => array(
-            __DIR__ . '/testing.config.php',
-        ),
-        'module_paths' => array(
-            'src',
-        ),
-    ),
-);
diff --git a/test/Validator/BitcoinAddressTest.php b/test/Validator/BitcoinAddressTest.php
index 1035e82..6fde89b 100644
--- a/test/Validator/BitcoinAddressTest.php
+++ b/test/Validator/BitcoinAddressTest.php
@@ -3,7 +3,7 @@
  * Sake
  *
  * @link      http://github.com/sandrokeil/BlockchainWalletApi for the canonical source repository
- * @copyright Copyright (c) 2014 Sandro Keil
+ * @copyright Copyright (c) 2014 - 2015 Sandro Keil
  * @license   http://github.com/sandrokeil/BlockchainWalletApi/blob/master/LICENSE.txt New BSD License
  */
 
diff --git a/test/View/Helper/SatoshiTest.php b/test/View/Helper/SatoshiTest.php
index baaa190..989bb54 100644
--- a/test/View/Helper/SatoshiTest.php
+++ b/test/View/Helper/SatoshiTest.php
@@ -3,7 +3,7 @@
  * Sake
  *
  * @link      http://github.com/sandrokeil/BlockchainWalletApi for the canonical source repository
- * @copyright Copyright (c) 2014 Sandro Keil
+ * @copyright Copyright (c) 2014 - 2015 Sandro Keil
  * @license   http://github.com/sandrokeil/BlockchainWalletApi/blob/master/LICENSE.txt New BSD License
  */
 
diff --git a/test/testing.config.php b/test/testing.config.php.dist
similarity index 94%
rename from test/testing.config.php
rename to test/testing.config.php.dist
index d38406e..0a12d1e 100644
--- a/test/testing.config.php
+++ b/test/testing.config.php.dist
@@ -3,7 +3,7 @@
  * Sake
  *
  * @link      http://github.com/sandrokeil/BlockchainWalletApi for the canonical source repository
- * @copyright Copyright (c) 2014 Sandro Keil
+ * @copyright Copyright (c) 2014 - 2015 Sandro Keil
  * @license   http://github.com/sandrokeil/BlockchainWalletApi/blob/master/LICENSE.txt New BSD License
  */