diff --git a/powerwall.sh b/powerwall.sh
index f4874ebc..b69738b9 100755
--- a/powerwall.sh
+++ b/powerwall.sh
@@ -742,7 +742,7 @@ SHUTDOWN_SERVERS(){
 		if [ ! -f $FOLDER/shutdown.main ]; then
 			touch $FOLDER/shutdown.main
 			echo -en "Disabling CLS in vCenter ... "
-			if [ $TEST != true ]; then
+			if [ "${TEST}" != "true" ]; then
 				ssh root@${PW_VCENTERHOST} "sed -i '/<domain-c1001>/{n;s/<enabled>.*<\/enabled>/<enabled>False<\/enabled>/}' /etc/vmware-vpx/vpxd.cfg >/dev/null 2>&1" >/dev/null 2>&1
 				ssh root@${PW_VCENTERHOST} "service-control --stop vmware-vpxd >/dev/null 2>&1" >/dev/null 2>&1
 				ssh root@${PW_VCENTERHOST} "service-control --start vmware-vpxd >/dev/null 2>&1" >/dev/null 2>&1
@@ -751,18 +751,18 @@ SHUTDOWN_SERVERS(){
 		
 			for ESXIHOST in "${PW_MAINSITE_HOSTS[@]}"; do
 				echo -en "Stopping iSCSI VM's on: ${ESXIHOST} ... "
-				[ $TEST != true ] && ${PW_FOLDER}/esxi-scripts/iscsi-vm-shutdown.ps1 ${ESXIHOST} >/dev/null 2>&1
+				[ "${TEST}" != "true" ] && ${PW_FOLDER}/esxi-scripts/iscsi-vm-shutdown.ps1 ${ESXIHOST} >/dev/null 2>&1
 				echo "Done"
 			done
 			for ESXIHOST in "${PW_MAINSITE_HOSTS[@]}"; do
 				echo -en "Verifying iSCSI VM's stopped on: ${ESXIHOST} ... "
-				[ $TEST != true ] && ${PW_FOLDER}/esxi-scripts/iscsi-vm-shutdown-verify.ps1 ${ESXIHOST} >/dev/null 2>&1
+				[ "${TEST}" != "true" ] && ${PW_FOLDER}/esxi-scripts/iscsi-vm-shutdown-verify.ps1 ${ESXIHOST} >/dev/null 2>&1
 				echo "Done"
 			done
 			# sleep 1m
 			for ESXIHOST in "${PW_MAINHOSTS[@]}"; do
 				echo -en "Stopping Remaining VM's on: ${ESXIHOST} ... "
-				if [ $TEST != true ]; then
+				if [ "${TEST}" != "true" ]; then
 					ssh root@${ESXIHOST} 'esxcli system maintenanceMode set -e true -t 0' &
 					${PW_FOLDER}/esxi-scripts/vm-shutdown.ps1 ${ESXIHOST} >/dev/null 2>&1
 					${PW_FOLDER}/esxi-scripts/iscsi-server-shutdown.ps1 ${ESXIHOST} >/dev/null 2>&1
@@ -772,7 +772,7 @@ SHUTDOWN_SERVERS(){
 			sleep 1m
 			for ESXIHOST in "${PW_MAINHOSTS[@]}"; do
 				echo -en "Shutting down host: ${ESXIHOST} ..."
-				if [ $TEST != true ]; then
+				if [ "${TEST}" != "true" ]; then
 					ssh root@${ESXIHOST} 'esxcli system shutdown poweroff -d 10 -r "Automated ESXi host shutdown"'
 					ssh root@${ESXIHOST} 'esxcli system maintenanceMode set -e false -t 0'
 				fi
@@ -781,7 +781,7 @@ SHUTDOWN_SERVERS(){
 		
 			for ESXIHOST in "${PW_MAINHOSTS[@]}"; do
 				echo -en "Waiting for Host (${ESXIHOST}) to shutdown... "
-				if [ $TEST != true ]; then
+				if [ "${TEST}" != "true" ]; then
 				    while ping -qw 10 -c3 "${ESXIHOST}">/dev/null 2>&1; do
 				    	sleep 1
 				    done
@@ -797,12 +797,12 @@ SHUTDOWN_SERVERS(){
 
 			for ESXIHOST in "${PW_SYSHOSTS[@]}"; do
 				echo -en "Suspending DB, PiHole & vCenter VM's on: ${ESXIHOST} ... "
-				[ $TEST != true ] && ${PW_FOLDER}/esxi-scripts/sys-suspend.ps1 ${ESXIHOST} >/dev/null 2>&1
+				[ "${TEST}" != "true" ] && ${PW_FOLDER}/esxi-scripts/sys-suspend.ps1 ${ESXIHOST} >/dev/null 2>&1
 				echo "Done"
 			done
 			for ESXIHOST in "${PW_SYSHOSTS[@]}"; do
 				echo -en "Shutting Down VM's on: ${ESXIHOST} ... "
-				if [ $TEST != true ]; then
+				if [ "${TEST}" != "true" ]; then
 					${PW_FOLDER}/esxi-scripts/vm-shutdown.ps1 ${ESXIHOST} >/dev/null 2>&1
 					${PW_FOLDER}/esxi-scripts/iscsi-server-shutdown.ps1 ${ESXIHOST} >/dev/null 2>&1
 				fi
@@ -810,7 +810,7 @@ SHUTDOWN_SERVERS(){
 			done
 			for ESXIHOST in "${PW_SYSHOSTS[@]}"; do
 				echo -en "Shutting Down Host: ${ESXIHOST} ... "
-				if [ $TEST != true ]; then
+				if [ "${TEST}" != "true" ]; then
 					ssh root@${ESXIHOST} 'esxcli system maintenanceMode set -e true -t 0'
 					ssh root@${ESXIHOST} 'esxcli system shutdown poweroff -d 10 -r "Automated ESXi host shutdown"' &
 					ssh root@${ESXIHOST} 'esxcli system maintenanceMode set -e false -t 0'
@@ -820,7 +820,7 @@ SHUTDOWN_SERVERS(){
 
 			for ESXIHOST in "${PW_SYSHOSTS[@]}"; do
 				echo -en "Waiting for Host (${ESXIHOST}) to shutdown ... "
-				if [ $TEST != true ]; then
+				if [ "${TEST}" != "true" ]; then
 					while ping -qw 10 -c3 "${ESXIHOST}">/dev/null 2>&1; do
 						sleep 1
 					done
@@ -834,26 +834,26 @@ SHUTDOWN_SERVER(){
 	echo "($datetime) - Shutting down ${1}" >> ${PW_LOGFILE}
 	
 	echo -en "Enabling Maintenance mode and will wait for iSCSI VM's to begin migrating ... "
-	[ $TEST != true ] && ${PW_FOLDER}/esxi-scripts/host-maintenance_mode.ps1 ${PW_ESXI_HOST_NAMES[${1}]} & >/dev/null 2>&1
+	[ "${TEST}" != "true" ] && ${PW_FOLDER}/esxi-scripts/host-maintenance_mode.ps1 ${PW_ESXI_HOST_NAMES[${1}]} & >/dev/null 2>&1
 	sleep 45s
 	echo "Done"
 	
 	echo -en "Shutting Down VM's on: ${1} ... "
-	if [ $TEST != true ]; then
+	if [ "${TEST}" != "true" ]; then
 		${PW_FOLDER}/esxi-scripts/vm-shutdown.ps1 ${1} >/dev/null 2>&1
 		${PW_FOLDER}/esxi-scripts/iscsi-server-shutdown.ps1 ${1} >/dev/null 2>&1
 	fi
 	echo "Done"
 
 	echo -en "Shutting Down Host: ${1} ... "
-	if [ $TEST != true ]; then
+	if [ "${TEST}" != "true" ]; then
 		ssh root@${1} 'esxcli system shutdown poweroff -d 10 -r "Automated ESXi host shutdown"' & >/dev/null 2>&1
 		ssh root@${1} 'esxcli system maintenanceMode set -e false -t 0' >/dev/null 2>&1
 	fi
 	echo "Done"
 
 	echo -en "Waiting for Host (${1}) to shutdown ... "
-	if [ $TEST != true ]; then
+	if [ "${TEST}" != "true" ]; then
 	    while ping -qw 10 -c3 "${1}">/dev/null 2>&1; do
 	    	sleep 1
 	    done