Added Client model and all its test