Stabilize and update EffectiveIdentityTest