Fix phone test again, and validation rules