Adding tests
Merge pull request #157 from willyaranda/feature/tests2

Adding tests