Updated to fix timing issue in BasicClientsTest; added EditClientTest