ETH-24 - Multiple client endpoints for end to end testing