Update unit tests to reflect latest changes
Merge pull request #1 from treydock/master

Update unit tests to reflect latest changes