ENCUESTAME-669 Unit tests
Added new Unit tests
Merge pull request #48 from juanpicado/1.5.x

1.5.x