Simplified time conditions to avoid test failure due to buffering

Change-Id: Iaac57130c396a40f2e439352ce64d2025c01d607