(PUP-3364) Fix tests failing after change to error message

and fix one message that still displayed Ruby type name instead of
puppet type name.