Revert "Revert "rewritten logic  for administration tests by analogy with external links""

This reverts commit 42816683b46c8a4e5f0ca844025decfc2443efb2.