Added working test server/client