updated test client
updated server