Merged fix for get-tests-for-run(s)