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

Update unit tests.