some fix to speed tests