Adding unit tests and fixing errors
Merge pull request #1 from ramirovjr/development

Adding unit tests and fixing errors