undo opaque=fopaque changes; make test script more flexible
diff --git a/Demo/rpc/test b/Demo/rpc/test
index d3c9591..ba220f2 100755
--- a/Demo/rpc/test
+++ b/Demo/rpc/test
@@ -1,15 +1,16 @@
: ${PYTHON=python}
+: ${SERVER=charon.cwi.nl}
set -xe
$PYTHON -c 'from rpc import test; test()'
-$PYTHON -c 'from rpc import test; test()' charon.cwi.nl
+$PYTHON -c 'from rpc import test; test()' ${SERVER}
$PYTHON -c 'from rpc import testsvr; testsvr()' &
-SVR=$!
+PID=$!
sleep 2
$PYTHON -c 'from rpc import testclt; testclt()'
-kill -2 $SVR
+kill -2 $PID
$PYTHON -c 'from mountclient import test; test()'
$PYTHON -c 'from mountclient import test; test()' gatekeeper.dec.com