Merge "Separate non-admin AZ tests from admin test files"