yas speed test refactored