clean up
add more client tests