Syncing with the latest client tests

Signed-off-by: Lucas Meneghel Rodrigues <lmr@redhat.com>
Syncing with the latest server tests

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