Tweak tests broken by availability window change