HG-34 fix broken tests