Merge "Authz unit test and code cleanup"