diff --git a/src/base/install.sh b/src/base/install.sh
index a678fc9..0abb387 100755
--- a/src/base/install.sh
+++ b/src/base/install.sh
@@ -79,5 +79,7 @@ echo "Install took $elapsed seconds."
 echo "elapsed=$elapsed" > .report
 echo "ADJUSTED_ID=$ADJUSTED_ID" >> .report
 echo "USERNAME=$USERNAME" >> .report
+echo "UID=$UID" >> .report
+echo "GID=$GID" >> .report
 
 exit $?
diff --git a/src/base/modules/common-utils.sh b/src/base/modules/common-utils.sh
index f019d9b..1580849 100755
--- a/src/base/modules/common-utils.sh
+++ b/src/base/modules/common-utils.sh
@@ -185,9 +185,12 @@ chsh -s /bin/zsh ${USERNAME}
 if [ "$ADJUSTED_ID" = "mac" ]; then
   dscl . -read /Users/${USERNAME} UserShell
 else
-  getent passwd $(USERNAME) | awk -F: '{ print $7 }'
+  getent passwd $USERNAME | awk -F: '{ print $7 }'
 fi
 
+echo "debugging username, uid, gid, shell"
+cat /etc/passwd
+
 # Install packages for appropriate OS
 case "${ADJUSTED_ID}" in
     "debian")
@@ -222,6 +225,7 @@ if [ "$ADJUSTED_ID" != "mac" ]; then
   chmod -R 775 $(dirname $ZSHPLUG_PATH)
 fi
 
+echo "Installing system-wide plugin manager for vim..."
 curl -fLo "${VIMPLUG_PATH}/autoload/plug.vim" --create-dirs \
     https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim
 if [ "$ADJUSTED_ID" != "mac" ]; then
@@ -257,7 +261,7 @@ if [ "${UPDATE_RC}" = "true" ]; then
 fi
 
 vim_rc_snippet=$(cat <<EOF
-let g:vim_plug_home = '$VIMPLUG_PATH'
+let g:vim_plug_home="$VIMPLUG_PATH"
 
 execute 'source ' . g:vim_plug_home . '/autoload/plug.vim'
 call plug#begin(g:vim_plug_home . '/plugged')
diff --git a/src/base/modules/node.sh b/src/base/modules/node.sh
index 12f68cf..24ad06a 100755
--- a/src/base/modules/node.sh
+++ b/src/base/modules/node.sh
@@ -47,7 +47,7 @@ if [ "${UPDATE_RC}" = "true" ]; then
 fi
 
 if [ "${NODE_VERSION}" != "" ]; then
-    su ${USERNAME} -c "umask 0002 && source ${NVM_DIR}/nvm.sh && nvm install '${NODE_VERSION}' && nvm alias default '${NODE_VERSION}'"
+    su ${USERNAME} -c "umask 0002 && . ${NVM_DIR}/nvm.sh && nvm install '${NODE_VERSION}' && nvm alias default '${NODE_VERSION}'"
 fi
 
 # Additional node versions to be installed but not be set as default.
@@ -56,11 +56,11 @@ if [ ! -z "${ADDITIONAL_VERSIONS}" ]; then
     IFS=","
         read -a additional_versions <<< "$ADDITIONAL_VERSIONS"
         for version in "${additional_versions[@]}"; do
-            su ${USERNAME} -c "umask 0002 && source ${NVM_DIR}/nvm.sh && nvm install ${version}"
+            su ${USERNAME} -c "umask 0002 && . ${NVM_DIR}/nvm.sh && nvm install ${version}"
         done
 
         if [ "${NODE_VERSION}" != "" ]; then
-          su ${USERNAME} -c "umask 0002 && source ${NVM_DIR}/nvm.sh && nvm use default"
+          su ${USERNAME} -c "umask 0002 && . ${NVM_DIR}/nvm.sh && nvm use default"
         fi
     IFS=$OLDIFS
 fi
diff --git a/test/base/scenarios.json b/test/base/scenarios.json
index 1e2c1f4..6ed0b9e 100644
--- a/test/base/scenarios.json
+++ b/test/base/scenarios.json
@@ -2,6 +2,7 @@
   "base": {
     "image": "mcr.microsoft.com/devcontainers/base:debian",
     "remoteUser": "customUser",
+    "updateRemoteUserUID": false,
     "features": {
         "base": {
           "username": "customUser",