Agregando unit tests.
Code review feedback.