Merge pull request #7 from treydock/fix_unit_tests

Unit test updates