Add Tests to Model
Add other files
Add other file
Fix conflicts