remove DESCRIPTOR tag in RIS which is redundant and invalid/breaks our RIS type detection. Update tests for keyword format change