fixed data model, test datas created in object model, moved pictures to resources