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

Yeah, you can drop the client env settings and just specify a different time here, without hard-coding it into the env.