Updating server and client tests to the latest master

Signed-off-by: Lucas Meneghel Rodrigues <lmr@redhat.com>