Added some more specs and updated corresponding factories, attributes & validations