Increase some timeouts and remove time-based assertions from tests other than duration.