CONN-953 Updates to RegressionSuite for HIEM removal