Fixed models, factories, added spec