Unit test fixes.
Merge pull request #24 from e-cuellar/master

Unit test fixes.