Fixes for unittest deprecations
Merge pull request #35 from kevmoo/unittest_fixes

Fixes for unittest deprecations