better test-client, small update on server