Merge "Added UT auth-deforg, code cov 61%"