First round of tests (#3)
Merge pull request #4 from passy/unit-tests

First round of tests