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

Having special paths for tests is a bad idea--it means that we're not testing the same code when we run our tests.  I'd try to avoid this.