Remove client tests fix