Merge fix for PEM test suite error codes