add a self-managing client for testing