Merge pull request #3 from gerferra/fix-tests

Fixes en tests y ...