Completed some minor TODOs; externalised ID type config, added NIST test
data for XDS functional test