improved unit tests
Merge pull request #430 from telefonicaid/hardening/426_unit_tests

improved unit tests