ACCESS-36: Support URI type for Authorization. Addional test fixes