*9034* Fix broken test by 9034 fix