Fix merge of tests.
Merge pull request #8 from cravacuore/develop

Fix merge of tests.