Edit model validation & related factories

  In this state the definition of the model validation and factories
  in the specs are consistent, at least, in my brain (hopefully...).