Fix specs to pass with tighter constraints

* Change to use factory girl when the object used would otherwise be
  invalid.