Fixes Issue 30[complete] and Fixes Issue 11[WIP] - locked clients, client-to-server server-side testing

If I move it above line 17, the old value of that env var will conflict with the new one, failing the timeout tests.