Add even better availabilityTest