diff --git a/phpunit.hhvm.xml b/phpunit.hhvm.xml
new file mode 100644
index 0000000..5df38f6
--- /dev/null
+++ b/phpunit.hhvm.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit backupGlobals="false"
+         backupStaticAttributes="false"
+         bootstrap="./phpunit.php"
+         colors="true"
+         convertErrorsToExceptions="true"
+         convertNoticesToExceptions="true"
+         convertWarningsToExceptions="true"
+         processIsolation="false"
+         stopOnFailure="false"
+         syntaxCheck="true"
+         verbose="true"
+>
+    <testsuites>
+        <testsuite name="flysystem/tests">
+            <directory suffix=".php">./tests/</directory>
+        </testsuite>
+    </testsuites>
+    <filter>
+        <whitelist>
+            <directory suffix=".php">./src/</directory>
+        </whitelist>
+    </filter>
+</phpunit>
\ No newline at end of file
diff --git a/phpunit.php b/phpunit.php
new file mode 100644
index 0000000..2c9fb1d
--- /dev/null
+++ b/phpunit.php
@@ -0,0 +1,3 @@
+<?php
+
+require __DIR__.'/vendor/autoload.php';
\ No newline at end of file
diff --git a/phpunit.xml b/phpunit.xml
new file mode 100644
index 0000000..2131e26
--- /dev/null
+++ b/phpunit.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit backupGlobals="false"
+         backupStaticAttributes="false"
+         bootstrap="./phpunit.php"
+         colors="true"
+         convertErrorsToExceptions="true"
+         convertNoticesToExceptions="true"
+         convertWarningsToExceptions="true"
+         processIsolation="false"
+         stopOnFailure="false"
+         syntaxCheck="true"
+         verbose="true"
+>
+    <testsuites>
+        <testsuite name="flysystem/tests">
+            <directory suffix=".php">./tests/</directory>
+        </testsuite>
+    </testsuites>
+    <filter>
+        <whitelist>
+            <directory suffix=".php">./src/</directory>
+        </whitelist>
+    </filter>
+    <logging>
+        <log type="coverage-text" target="php://stdout" showUncoveredFiles="true"/>
+        <log type="coverage-html" target="coverage" showUncoveredFiles="true"/>
+        <log type="coverage-clover" target="coverage.xml" showUncoveredFiles="true"/>
+    </logging>
+</phpunit>
\ No newline at end of file
diff --git a/src/BackblazeAdapter.php b/src/BackblazeAdapter.php
index e92aed9..32a7541 100755
--- a/src/BackblazeAdapter.php
+++ b/src/BackblazeAdapter.php
@@ -34,11 +34,12 @@ public function has($path)
      */
     public function write($path, $contents, Config $config)
     {
-        return $this->getClient()->upload([
+        $file = $this->getClient()->upload([
             'BucketName' => $this->bucketName,
             'FileName' => $path,
             'Body' => $contents
         ]);
+        return $this->getFileInfo($file);
     }
 
     /**
@@ -46,11 +47,12 @@ public function write($path, $contents, Config $config)
      */
     public function writeStream($path, $resource, Config $config)
     {
-        return $this->getClient()->upload([
+        $file = $this->getClient()->upload([
             'BucketName' => $this->bucketName,
             'FileName' => $path,
             'Body' => $resource
         ]);
+        return $this->getFileInfo($file);
     }
 
     /**
diff --git a/tests/BackblazeAdapterTests.php b/tests/BackblazeAdapterTests.php
new file mode 100644
index 0000000..a958824
--- /dev/null
+++ b/tests/BackblazeAdapterTests.php
@@ -0,0 +1,29 @@
+<?php
+
+use ChrisWhite\B2\Client;
+use Mhetreramesh\Flysystem\BackblazeAdapter as Backblaze;
+use \ChrisWhite\B2\File;
+use \League\Flysystem\Config;
+
+class BackblazeAdapterTests extends PHPUnit_Framework_TestCase
+{
+    public function backblazeProvider()
+    {
+        $mock = $this->prophesize('ChrisWhite\B2\Client');
+        return [
+            [new Backblaze($mock->reveal(), 'my_bucket'), $mock],
+        ];
+    }
+
+    /**
+     * @dataProvider  backblazeProvider
+     */
+    public function testWrite($adapter, $mock)
+    {
+        $mock->upload(["BucketName" => "my_bucket", "FileName" => "something", "Body" => "contents"])->willReturn(new File('something','','','',''), false);
+        $result = $adapter->write('something', 'contents', new Config());
+        $this->assertInternalType('array', $result);
+        $this->assertArrayHasKey('type', $result);
+        $this->assertEquals('file', $result['type']);
+    }
+}
\ No newline at end of file