Fixes for PE3.3.
Merge pull request #264 from apenney/fixes-for-tests

Fixes for PE3.3.
Further fixes to tests for 14.04.
Merge pull request #265 from apenney/fix-tests

Further fixes to tests for 14.04.