[new_client]: More tests and cleanup