Fix: Ensure commit_in_future test works on 1.8.7