Speed testing changes