Modified clients_test