Remove the extra test-runner dir name and fix a few debug labels