Clients model and test model streamlined