Merge pull request #7 from fontanalorenzo/develop

Changes to the tests