Story 1657 rework. Added test cases for a subject with no principal and a subject with more than one principal.
