Clean up test failures
Merge pull request #346 from mhaskel/1.6_test_fixes

Clean up test failures