fix unit tests
Merge pull request #44 from sailthru/fix_unit_tests

fix unit tests