work to make specs less rigid when modifying data structures.

In a few other commits by my team, we modify a number of models.  These functionally equivalent spec changes allow all of the code we wrote to actually pass specs.