Add better AvailabilityTest