Merge pull request #366 from mhaskel/fix_unit_tests