Various speed test related changes.