Made changes to data model
Setup initial tests