flying: Rework client tests