Add more validation and fix the related fixtures & factory