Another update to the Azure test code.