Add test server; refactor client to use intelligent id