Updated factories for new data models
Merge branch 'setratings'