Improved timing of Future tests