Unit tests revision are done.

Signed-off-by: Fellipe Souto <fllsouto@gmail.com>
Refactored the creation of objects using model methods.

Signed-off-by: Fellipe Souto <fllsouto@gmail.com>