Corrected the Entity Model of the unit tests