Update factories to reflect new database schema