Test fixes
Merge pull request #343 from mhaskel/test_fixes

Test fixes