client-test: error messages reorganised + cosmetics