CLC-3641 Consolidate userinfo specs and clean up