Fixing deactivate tests.

Fixes #357.

test/fast/Running "nvm deactivate" should unset the nvm environment variables.

@@ -7,9 +7,11 @@ die () { echo $@ ; exit 1; }
 [ `expr $PATH : ".*v0.2.3/.*/bin"` = 0 ] || echo "WARNING: Unexpectedly found v0.2.3 already active" >&2
 
 . ../../nvm.sh
-nvm use v0.2.3 &&
-[ `expr $PATH : ".*v0.2.3/.*/bin"` != 0 ] && [ `expr $NODE_PATH : ".*v0.2.3/.*/lib/node_modules"` = 0 ] || die "Failed to activate v0.2.3"
+nvm use v0.2.3 || die "Failed to activate v0.2.3"
+[ `expr "$PATH" : ".*v0.2.3/.*/bin"` != 0 ] || die "PATH not set up properly"
+[ `expr "$NODE_PATH" : ".*v0.2.3/.*/lib/node_modules"` = 0 ] || die "NODE_PATH should not contain (npm root -g)"
 # ^ note: NODE_PATH should not contain `npm root -g` since globals should not be requireable
 
-nvm deactivate &&
-[ `expr $PATH : ".*v0.2.3/.*/bin"` = 0 ] && [ `expr $NODE_PATH : ".*v0.2.3/.*/lib/node_modules"` = 0 ] || die "Failed to deactivate v0.2.3"
+nvm deactivate || die "Failed to deactivate v0.2.3"
+[ `expr "$PATH" : ".*v0.2.3/.*/bin"` = 0 ] || die "PATH not cleaned properly"
+[ `expr "$NODE_PATH" : ".*v0.2.3/.*/lib/node_modules"` = 0 ] || die "NODE_PATH not cleaned properly"