Further refactoring of client, tests run again (even though they still use an OpenVPN server to test ack timeout :-D).