Clean-up the mess that was here. It's less error prone, shorter and easier to read.
* Test the client configuration to detect breakages