More test timing shenanigans