Added models, tests and factories