Update unit tests.
Merge pull request #225 from jeffreythomas/dev

Update unit tests.