fix imports
changing some methods and added test for two sources (wip)
Merge pull request #15 from marcosinger/fork/improvements

Creating first tests