diff --git a/.travis.yml b/.travis.yml
index 5bc980c..b39cdbc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,31 +1,25 @@
 language: php
 
 php:
-  - 5.3
-  - 5.4
-  - 5.5
   - 5.6
   - 7.0
   - 7.1
-  
+
 sudo: false
 
 matrix:
     include:
-        - php: 5.5.9
-          env: setup=lowest
-        - php: 5.5.9
-          env: setup=stable
         - php: 7.0
           env: setup=stable
-    allow_failures:
-        - php: 5.6
-        - php: 7.0
-        - php: 7.1
     fast_finish: true
 
+install:
+  - composer install
+
 script:
-  - phpunit --configuration phpunit.xml --coverage-clover=coverage.clover
+  - vendor/bin/phpunit --coverage-clover=coverage.clover
+
+after_script:
   - wget https://scrutinizer-ci.com/ocular.phar
   - php ocular.phar code-coverage:upload --access-token="53c569dececa0578c84587178c5f08e25df8c6e42c37bd313bf0802d2cf74a71" --format=php-clover coverage.clover
 
diff --git a/composer.json b/composer.json
index 8d41541..ee71244 100644
--- a/composer.json
+++ b/composer.json
@@ -46,6 +46,6 @@
     "php" : ">=5.6"
   },
   "require-dev" : {
-    "phpunit/phpunit" : "5.5"
+    "phpunit/phpunit" : "^5.5"
   }
 }
diff --git a/core/Pimf/Cache/Storages/Dba.php b/core/Pimf/Cache/Storages/Dba.php
index 0ee0a75..731a2bc 100644
--- a/core/Pimf/Cache/Storages/Dba.php
+++ b/core/Pimf/Cache/Storages/Dba.php
@@ -103,7 +103,7 @@ public function put($key, $value, $minutes)
             return;
         }
 
-        $value = self::expiration($minutes) . serialize($value);
+        $value = $this->expiration($minutes) . serialize($value);
 
         if (true === $this->has($key)) {
             return dba_replace($key, $value, $this->dba);
diff --git a/core/Pimf/Cache/Storages/File.php b/core/Pimf/Cache/Storages/File.php
index 0cc0f4d..c59a152 100644
--- a/core/Pimf/Cache/Storages/File.php
+++ b/core/Pimf/Cache/Storages/File.php
@@ -83,7 +83,7 @@ public function put($key, $value, $minutes)
             return null;
         }
 
-        $value = self::expiration($minutes) . serialize($value);
+        $value = $this->expiration($minutes) . serialize($value);
 
         return file_put_contents($this->path . $key, $value, LOCK_EX);
     }
diff --git a/core/Pimf/Cache/Storages/Pdo.php b/core/Pimf/Cache/Storages/Pdo.php
index 22c6ea1..b84f758 100644
--- a/core/Pimf/Cache/Storages/Pdo.php
+++ b/core/Pimf/Cache/Storages/Pdo.php
@@ -86,7 +86,7 @@ public function put($key, $value, $minutes)
     {
         $key = $this->key . $key;
         $value = serialize($value);
-        $expiration = self::expiration($minutes);
+        $expiration = $this->expiration($minutes);
 
         try {
             $sth = $this->pdo->prepare(
diff --git a/core/Pimf/Cache/Storages/Storage.php b/core/Pimf/Cache/Storages/Storage.php
index cf35b30..c1507c5 100644
--- a/core/Pimf/Cache/Storages/Storage.php
+++ b/core/Pimf/Cache/Storages/Storage.php
@@ -198,7 +198,7 @@ public function offsetUnset($key)
      *
      * @return int
      */
-    protected static function expiration($minutes)
+    public function expiration($minutes)
     {
         return time() + ($minutes * 60);
     }
diff --git a/core/Pimf/Redis.php b/core/Pimf/Redis.php
index 70b847d..d2a312b 100644
--- a/core/Pimf/Redis.php
+++ b/core/Pimf/Redis.php
@@ -158,7 +158,7 @@ protected function parse($response)
      *
      * @return resource
      */
-    protected function connect()
+    public function connect()
     {
         if (!is_null($this->connection)) {
             return $this->connection;
diff --git a/core/Pimf/Util/Uploaded.php b/core/Pimf/Util/Uploaded.php
index 6626480..f752e51 100644
--- a/core/Pimf/Util/Uploaded.php
+++ b/core/Pimf/Util/Uploaded.php
@@ -207,11 +207,12 @@ public static function getMaxFilesize()
         }
 
         $unit = strtolower(substr($max, -1));
+        $max = (int)substr($max, 0, -1);
 
         if (in_array($unit, array('g', 'm', 'k'), true)) {
             $max *= 1024;
         }
 
-        return (int)$max;
+        return $max;
     }
 }
diff --git a/tests/Pimf/Cache/PdoTest.php b/tests/Pimf/Cache/PdoTest.php
index 11130d4..988523c 100644
--- a/tests/Pimf/Cache/PdoTest.php
+++ b/tests/Pimf/Cache/PdoTest.php
@@ -44,9 +44,9 @@ public function testValueIsReturned()
             'key.'
         ))->getMock();
 
-        $cache->expects($this->any())->method('retrieve')->with('foo')->will($this->returnValue(serialize('foo')));
+        $cache->expects($this->any())->method('get')->with('foo')->will($this->returnValue(serialize('foo')));
 
-        $this->assertNull($cache->get('foo'));
+        $this->assertNotNull($cache->get('foo'));
 
     }
 
@@ -54,9 +54,12 @@ public function testSetMethodProperlyCallsPdo()
     {
         $store = $this->getStore();
 
-        $store->expects($this->any())->method('expiration')->with(60 * 60);
+        $cache = $this->getMockBuilder('\Pimf\Cache\Storages\Pdo')->setConstructorArgs(array(
+            $store,
+            'key.'
+        ))->getMock();
 
-        $cache = new \Pimf\Cache\Storages\Pdo($store, 'key.');
+        $cache->expects($this->any())->method('expiration')->with(60 * 60);
 
         $cache->put('foo', 'foo', 60);
     }
@@ -65,9 +68,12 @@ public function testSetMethodProperlyCallsPdoForNumerics()
     {
         $store = $this->getStore();
 
-        $store->expects($this->any())->method('expiration')->with(60 * 60);
+        $cache = $this->getMockBuilder('\Pimf\Cache\Storages\Pdo')->setConstructorArgs(array(
+            $store,
+            'key.'
+        ))->getMock();
 
-        $cache = new \Pimf\Cache\Storages\Pdo($store, 'key.');
+        $cache->expects($this->any())->method('expiration')->with(60 * 60);
 
         $cache->put('foo', 1, 60);
     }
@@ -90,4 +96,3 @@ public function testForgetMethodProperlyCallsRedis()
         $cache->forget('foo');
     }
 }
- 
\ No newline at end of file
diff --git a/tests/Pimf/Cache/RedisTest.php b/tests/Pimf/Cache/RedisTest.php
index 26e21e0..81efc46 100644
--- a/tests/Pimf/Cache/RedisTest.php
+++ b/tests/Pimf/Cache/RedisTest.php
@@ -10,7 +10,7 @@ protected function getRedis()
     {
         return $this->getMockBuilder('\\Pimf\\Redis')->disableOriginalConstructor()
             ->setMethods(
-                array('get', 'expire', 'set', 'del', 'forget', 'select', 'put', 'inline', 'bulk', 'multibulk')
+                array('connect', 'get', 'expire', 'set', 'del', 'forget', 'select', 'put', 'inline', 'bulk', 'multibulk')
             )->getMock();
     }
 
@@ -116,4 +116,3 @@ public function testForgetMethodProperlyCallsRedis()
     }
 
 }
- 
\ No newline at end of file
diff --git a/tests/Pimf/SessionTest.php b/tests/Pimf/SessionTest.php
index f373902..07be13b 100644
--- a/tests/Pimf/SessionTest.php
+++ b/tests/Pimf/SessionTest.php
@@ -283,12 +283,10 @@ public function testTokenMethodReturnsCSRFToken()
     public function testSaveMethodSweepsIfCleanerAndOddsHitWithTimeGreaterThanThreshold()
     {
         $payload = $this->getPayload();
-        $payload->storage = $this->getMock(
-            '\\Pimf\\Session\\Storages\\File', array(
-            'save',
-            'clean'
-        ), array(null)
-        );
+        $payload->storage = $this->getMockBuilder('\\Pimf\\Session\\Storages\\File')
+            ->setConstructorArgs(array(null))
+            ->setMethods(array('save','clean'))
+            ->getMock();
 
         $payload->session = $this->getSession();
         $expiration = time() - (\Pimf\Config::get('session.lifetime') * 60);
@@ -308,12 +306,10 @@ public function testSaveMethodSweepsIfCleanerAndOddsHitWithTimeGreaterThanThresh
     public function testSaveMethodSweepsIfCleanerAndOddsHitWithTimeLessThanThreshold()
     {
         $payload = $this->getPayload();
-        $payload->storage = $this->getMock(
-            '\\Pimf\\Session\\Storages\\File', array(
-            'save',
-            'clean'
-        ), array(null)
-        );
+        $payload->storage = $this->getMockBuilder('\\Pimf\\Session\\Storages\\File')
+            ->setConstructorArgs(array(null))
+            ->setMethods(array('save','clean'))
+            ->getMock();
 
         $payload->session = $this->getSession();
         $expiration = time() - (\Pimf\Config::get('session.lifetime') * 60);
@@ -331,12 +327,10 @@ public function testSaveMethodSweepsIfCleanerAndOddsHitWithTimeLessThanThreshold
     public function testCleanerShouldntBeCalledIfStorageIsntCleaner()
     {
         $payload = $this->getPayload();
-        $payload->storage = $this->getMock(
-            '\\Pimf\\Session\\Storages\\Apc', array(
-            'save',
-            'clean'
-        ), array(), '', false
-        );
+        $payload->storage = $this->getMockBuilder('\\Pimf\\Session\\Storages\\Apc')
+            ->disableOriginalConstructor()
+            ->setMethods(array('save','clean'))
+            ->getMock();
 
         $payload->session = $this->getSession();
         $payload->storage->expects($this->never())->method('clean');
@@ -349,12 +343,10 @@ public function testCleanerShouldntBeCalledIfStorageIsntCleaner()
     public function testCleanerShouldntBeCalledIfMemoryStorageIsntCleaner()
     {
         $payload = $this->getPayload();
-        $payload->storage = $this->getMock(
-            '\\Pimf\\Session\\Storages\\Memory', array(
-            'save',
-            'clean'
-        ), array(), '', false
-        );
+        $payload->storage = $this->getMockBuilder('\\Pimf\\Session\\Storages\\Memory')
+            ->disableOriginalConstructor()
+            ->setMethods(array('save','clean'))
+            ->getMock();
 
         $payload->session = $this->getSession();
         $payload->storage->expects($this->never())->method('clean');
@@ -367,12 +359,10 @@ public function testCleanerShouldntBeCalledIfMemoryStorageIsntCleaner()
     public function testCleanerShouldntBeCalledIfCookieStorageIsntCleaner()
     {
         $payload = $this->getPayload();
-        $payload->storage = $this->getMock(
-            '\\Pimf\\Session\\Storages\\Cookie', array(
-            'save',
-            'clean'
-        ), array(), '', false
-        );
+        $payload->storage = $this->getMockBuilder('\\Pimf\\Session\\Storages\\Cookie')
+            ->disableOriginalConstructor()
+            ->setMethods(array('save','clean'))
+            ->getMock();
 
         $payload->session = $this->getSession();
         $payload->storage->expects($this->never())->method('clean');
@@ -385,12 +375,10 @@ public function testCleanerShouldntBeCalledIfCookieStorageIsntCleaner()
     public function testCleanerShouldntBeCalledIfMemcachedStorageIsntCleaner()
     {
         $payload = $this->getPayload();
-        $payload->storage = $this->getMock(
-            '\\Pimf\\Session\\Storages\\Memcached', array(
-            'save',
-            'clean'
-        ), array(), '', false
-        );
+        $payload->storage = $this->getMockBuilder('\\Pimf\\Session\\Storages\\Memcached')
+            ->disableOriginalConstructor()
+            ->setMethods(array('save','clean'))
+            ->getMock();
 
         $payload->session = $this->getSession();
         $payload->storage->expects($this->never())->method('clean');
@@ -403,12 +391,10 @@ public function testCleanerShouldntBeCalledIfMemcachedStorageIsntCleaner()
     public function testCleanerShouldntBeCalledIfRedisStorageIsntCleaner()
     {
         $payload = $this->getPayload();
-        $payload->storage = $this->getMock(
-            '\\Pimf\\Session\\Storages\\Redis', array(
-            'save',
-            'clean'
-        ), array(), '', false
-        );
+        $payload->storage = $this->getMockBuilder('\\Pimf\\Session\\Storages\\Redis')
+            ->disableOriginalConstructor()
+            ->setMethods(array('save','clean'))
+            ->getMock();
 
         $payload->session = $this->getSession();
         $payload->storage->expects($this->never())->method('clean');
diff --git a/tests/Pimf/UriTest.php b/tests/Pimf/UriTest.php
index bc295ac..045bbd8 100644
--- a/tests/Pimf/UriTest.php
+++ b/tests/Pimf/UriTest.php
@@ -13,8 +13,8 @@ public function tearDown()
 
     protected function fakeUri($uri)
     {
-        $_SERVER = array('REQUEST_URI' => $uri, 'SCRIPT_NAME' => __FILE__, 'PATH_INFO' => $uri);
-        self::$env = new \Pimf\Environment($_SERVER);
+        $server = array('REQUEST_URI' => $uri, 'SCRIPT_NAME' => __FILE__, 'PATH_INFO' => $uri);
+        self::$env = new \Pimf\Environment($server);
         $envData = self::$env->data();
 
         \Pimf\Util\Header\ResponseStatus::setup($envData->get('SERVER_PROTOCOL', 'HTTP/1.0'));