SAMZA-54; fix sporadically failing test in blocking envelope map.