Client Server test, fixes #2