Fix on types and service changes
client tests