Issue #43: Minor refactoring of SpeedTest