Add factories for models, update specs