move vhnd_availability from report into data_provider, update tests