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

Fixes for PE3.3.