Added some unit tests
Merge pull request #3 from manuel-ornato/#1-unit-tests

Added some unit tests