diff --git a/basis/bin/shared_bash_function.sh b/basis/bin/shared_bash_function.sh
index 855ff112..3d69da6b 100755
--- a/basis/bin/shared_bash_function.sh
+++ b/basis/bin/shared_bash_function.sh
@@ -215,10 +215,11 @@ get_user_details() {
   fi
 
   # Find TF_VAR_username based on TF_VAR_user_ocid or the opposite
-  if [ "$TF_VAR_username" != "" ]; then
-    export TF_VAR_user_ocid=`oci iam user list --name $TF_VAR_username | jq -r .data[0].id`
-  elif [ "$TF_VAR_user_ocid" != "" ]; then
+  # In this order, else this is not reentrant. "oci iam user list" require more privileges.  
+  if [ "$TF_VAR_user_ocid" != "" ]; then
     export TF_VAR_username=`oci iam user get --user-id $TF_VAR_user_ocid | jq -r '.data.name'`
+  elif [ "$TF_VAR_username" != "" ]; then
+    export TF_VAR_user_ocid=`oci iam user list --name $TF_VAR_username | jq -r .data[0].id`
   fi  
   auto_echo TF_VAR_username=$TF_VAR_username
   auto_echo TF_VAR_user_ocid=$TF_VAR_user_ocid
diff --git a/option/test_suite_shared.sh b/option/test_suite_shared.sh
index 53db0387..ac4d8fdb 100755
--- a/option/test_suite_shared.sh
+++ b/option/test_suite_shared.sh
@@ -123,6 +123,7 @@ build_option() {
   if [ "$OPTION_SHAPE" != "amd" ]; then
     NAME=${NAME}-$OPTION_SHAPE
   fi  
+  NAME=${NAME/_/-}
   start_test $NAME
   cd $TEST_HOME/oci-starter
   ./oci_starter.sh \