diff --git a/h5pyd/version.py b/h5pyd/version.py
index c8ddfa9..d235102 100644
--- a/h5pyd/version.py
+++ b/h5pyd/version.py
@@ -16,7 +16,7 @@
 import sys
 import numpy
 
-version = "0.15.1"
+version = "0.16.0"
 
 hdf5_version = "REST"
 
@@ -28,8 +28,8 @@
     else ("",)
 )
 
-api_version_tuple = (0, 15, 1)
-api_version = "0.15.1"
+api_version_tuple = (0, 16, 0)
+api_version = "0.16.0"
 
 __doc__ = """\
 This is h5pyd **%s**
diff --git a/setup.py b/setup.py
index 3e76972..e48ae4d 100644
--- a/setup.py
+++ b/setup.py
@@ -23,7 +23,7 @@
 
 setup(
     name="h5pyd",
-    version="0.15.1",
+    version="0.16.0",
     description="h5py compatible client lib for HDF REST API",
     long_description=long_description,
     url="http://github.com/HDFGroup/h5pyd",
diff --git a/test/apps/common.py b/test/apps/common.py
index 66465c0..fc88db1 100644
--- a/test/apps/common.py
+++ b/test/apps/common.py
@@ -64,7 +64,7 @@ def test_user1(self):
     @property
     def test_user2(self):
         user2 = {}
-        if  "TEST12_USERNAME" in os.environ:
+        if  "TEST2_USERNAME" in os.environ:
             user2["name"] = os.environ["TEST2_USERNAME"]
         else:
             user2["name"] = "test_user2"
@@ -204,13 +204,10 @@ def getFileName(self, basename):
             if "H5PYD_TEST_FOLDER" in os.environ:
                 domain = os.environ["H5PYD_TEST_FOLDER"]
             else:
-                domain = "h5pyd_test.hdfgroup.org"
-            if domain.find('/') > -1:
-                # Use path-style domain naming
-                filename = op.join(domain, basename)
-                filename += ".h5"
-            else:
-                filename = basename + "." + domain
+                domain = "/"
+            # Use path-style domain naming
+            filename = op.join(domain, basename)
+            filename += ".h5"
         return filename