Make "--aggressive" acid test option work properly