Merge "Specify AZ for non-scenario tests"