diff --git a/test-scripts/run-deeplink-tests.sh b/test-scripts/run-deeplink-tests.sh
index b0cf048a..e20dd1e9 100755
--- a/test-scripts/run-deeplink-tests.sh
+++ b/test-scripts/run-deeplink-tests.sh
@@ -54,7 +54,7 @@ urlencode() {
     for (( pos=0 ; pos<strlen ; pos++ )); do
         c=${string:$pos:1}
         case "$c" in
-            [-_.~a-zA-Z0-9] ) o="${c}" ;;
+            [-_.~a-zA-Z0-9:] ) o="${c}" ;;
             * )               printf -v o '%%%02x' "'$c"
         esac
         encoded+="${o}"
@@ -66,19 +66,20 @@ urlencode() {
 execute_deeplink() {
     local url="$1"
     local description="$2"
-    local encoded_url=$(urlencode "$url")
     
     echo -e "\n${BLUE}Testing: $description${NC}"
+    echo -e "${YELLOW}Original URL: $url${NC}"
     
     if [ "$TEST_MODE" = "print" ]; then
-        echo -e "${YELLOW}Deep Link URL:${NC}"
-        echo "$url"
-        echo -e "${YELLOW}Encoded URL:${NC}"
-        echo "$encoded_url"
         echo "---"
     else
-        echo "URL: $url"
-        if adb shell am start -a android.intent.action.VIEW -d "$encoded_url"; then
+        # Stop the app before executing the deep link
+        adb shell am force-stop app.timesafari.app
+        sleep 1  # Give it a moment to fully stop
+        
+        if adb shell am start -W -a android.intent.action.VIEW \
+            -d "$url" \
+            -c android.intent.category.BROWSABLE; then
             echo -e "${GREEN}Success: Deeplink executed${NC}"
             sleep "$TIMEOUT"
         else
@@ -110,8 +111,11 @@ main() {
         "Testing raw claim addition"
     
     # 2. DID-based deeplinks
+    execute_deeplink "timesafari://did/test" \
+        "Testing DID view with test identifier"
+    /d
     execute_deeplink "timesafari://did/$CONTACT1_DID" \
-        "Testing DID view"
+        "Testing DID view with contact DID"
         
     execute_deeplink "timesafari://contact-edit/$CONTACT1_DID" \
         "Testing contact editing"