Adjust tests and create two clients