Tweaked test timeouts to reduce flakiness