Take into account new tests location.
Merge pull request #15 from Jorge-C/master

Take into account new tests location, closes #9