Fixes #11 - Server side client-to-server testing