Updated tests.
Merge pull request #296 from michaelDpierce/tests

Updated tests.