Add client model and test