External id tests have been improved.