Fixed problem interfering client tests