Location Choosing for the Speedtest

It would be nice if there was a way to choose the server location for the speed test manually.
Since the Speed test is setting the location by itself it is not always choosing the best targets for Ping tests.
I for example see on the Map that there is a Zurich location but i get connected to Frankfurt:

There were also multiple Requests in the Cloudflare community:
https://community.cloudflare.com/t/speedtest-is-not-testing-with-nearest-server/315176
https://community.cloudflare.com/t/unable-to-select-server-location/274461/5
https://community.cloudflare.com/t/server-selection-for-the-new-speedtest/177498

Also, a friend of mine scripted a speed test on a Raspberry Pi to generate proof that his ISP is not delivering as promised.
He chose the Cloudflare speed test since it is one of the largest internet companies, and therefore, nobody can argue that the servers do not have the required speeds. Like the ISP did with Hetzner based speed tests.
Now the ISP argues that the server needs to be in the same country as the user testing.

Is something like that on the roadmap of this tool?