Fixes to get tests running on trusty.
Merge pull request #178 from mhaskel/ubuntu-test-fixes

Fixes to get tests running on trusty.