Added testAddAndRemoveClient