Updated testing
Updated readme
Updated unit tests
Merge pull request #14 from cferdinandi/tests

Improvements