Resolve test failures on apache.
Merge pull request #736 from mhaskel/test_failures

Test failures