Remove dirty hack and add a more dirty hack to fetch usable run-tests