Fixed failing client tests