Updated existing tests to correspond with new models.