Minor Refactor: SubjectConfirmationMethod setting to more appropriate location
Added ‘shortcut’ for getNameId and getNameIdFormat, seeing as NameID is actually pretty important to us.
Fixed tests