Merge pull request #265 from apenney/fix-tests

Further fixes to tests for 14.04.