Fix tests
Merge pull request #1 from danielcsgomes/development

Fix tests