Authz unit test and code cleanup

No match.