Fix query loading in run-workload.py

The code that run-workload.py uses to retrieve the queries for particular workloads has not been kept up to date with changes to the contents of the testdata/workload/* directories, resulting in it picking up and running various queries that were not really intended to be part of the workloads.