Updated tests
Merge pull request #7 from mindmelting/update-tests

Updated tests