Fixed problems with merge of model tests and factories