refactored and added multiple clients to test