Do not unset $PATH
clean up test comments