Adjust test set once more to actually reduce it. Also increase timeout to 6 hours.