Development tom

Creation of extra unit tests.
Cleaned Code