Fixed tests
Merge pull request #114 from ricbra/tests_fix

Fixed tests