Fix further merge issue
Fix up UT breakages - script inaccuracy causing failures now authentication looks at SIP identity