fix failing tests after namespace updates in HC