Replace fixture with data migration, syntax cleanup