Changes to model
Created UnitTests