Some changes in models + tests & factories