Minor updates to speed tests