Added unit tests
Merge pull request #1 from anna-sambros/master

Pulled Anna's changes