small test and client fixes