Introduce Factory, remove Client
Use an even less popular port for tests