Make unlock test filtering aware of alternate names