Using Hz test instances instead of actual instances

Issue #4047
Using Hz test instances instead of actual instances