Minimizing the wait time for nextTimeToQuery
Revert "Fix test"

This reverts commit 8f9bb9efad7ce16ee8047407b6628181938d1b4b.