diff --git a/package.json b/package.json
index ca4ab10e..896bb777 100644
--- a/package.json
+++ b/package.json
@@ -32,7 +32,7 @@
     "mkpath": "^1.0.0",
     "node-version-compare": "^1.0.1",
     "plist": "^1.2.0",
-    "rimraf": "^2.5.1",
+    "rimraf": "^2.5.2",
     "xml2js": "^0.4.16"
   }
 }
diff --git a/src/android/io/branch/BranchSDK.java b/src/android/io/branch/BranchSDK.java
index 6f84d776..66c37237 100644
--- a/src/android/io/branch/BranchSDK.java
+++ b/src/android/io/branch/BranchSDK.java
@@ -375,8 +375,8 @@ private void createBranchUniversalObject(JSONObject options) throws JSONExceptio
 
             while (keys.hasNext()) {
                 String key = (String) keys.next();
-                Log.d(LCAT, contentMetaData.getString(key));
                 String value = contentMetaData.optString(key);
+                Log.d(LCAT, contentMetaData.getString(key));
                 this.branchObj.addContentMetadata(key, value);
             }
         }
diff --git a/testbed/init.sh b/testbed/init.sh
index 5a3893ff..02bcfce8 100644
--- a/testbed/init.sh
+++ b/testbed/init.sh
@@ -1,3 +1,4 @@
 #!/bin/bash
 cordova platform add ios android
-cordova plugin add ../ --link --variable BRANCH_LIVE_KEY=key_live_fnmRM1FXtu11t6e4LU8WsldpvDcA0bzv --variable URI_SCHEME=testbed --variable ENCODED_ID=X9Ug
\ No newline at end of file
+cordova plugin add ../ --link --variable BRANCH_LIVE_KEY=key_live_fnmRM1FXtu11t6e4LU8WsldpvDcA0bzv --variable URI_SCHEME=testbed --variable ENCODED_ID=X9Ug
+cordova plugin add https://github.com/nordnet/cordova-universal-links-plugin.git