Add test server & client