tests improved
code fix
tests improved
Merge pull request #2353 from Ragazzo/tests_improved

tests improved